./packages/libreoffice/3.3.0/experimental r2168: replace old openoffice.org-{base, math, draw, impress, common, kde, writer, calc}
------------------------------------------------------------
revno: 2168
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2010-11-01 23:27:15 +0100
message:
replace old openoffice.org-{base,math,draw,impress,common,kde,writer,calc}
modified:
changelog
control
control.in
control.kde.in
=== modified file 'changelog'
--- a/changelog 2010-11-01 22:01:37 +0000
+++ b/changelog 2010-11-01 22:27:15 +0000
@@ -8,6 +8,7 @@
* debian/control.in:
- make -math depend on ttf-opensymbol (>> 2:2.4.3~)
- remove build-dep on imagemagick
+ - replace old openoffice.org-{base,math,draw,impress,common,kde,writer,calc}
* debian/copyright:
- update again, it's actually supposed to be "Copyright (c) 2000, 2010
LibreOffice contributors and/or their affiliates."
@@ -30,7 +31,7 @@
* debian/rules, debian/control.in: add Bugs: header to divert reports on backports
to debian-backports@l.d.o
- -- Rene Engelhard <rene@debian.org> Mon, 01 Nov 2010 23:00:43 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 01 Nov 2010 23:24:08 +0100
libreoffice (1:3.3.0~beta2-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-11-01 22:01:37 +0000
+++ b/control 2010-11-01 22:27:15 +0000
@@ -121,7 +121,7 @@
Recommends: xfonts-mathml, ${textcat-data-recommends}
Conflicts: libreoffice-debian-files, libreoffice-mimelnk, libreoffice2-common, openclipart-libreoffice (<= 0.17+dfsg-4), libreoffice-l10n-en-us, libreoffice-debian-menus, libreoffice-base (<< ${base-version}), libreoffice-writer (<< ${base-version}), libreoffice-calc (<< ${base-version}), libreoffice-impress (<< ${base-version}), libreoffice-draw (<< ${base-version}), libreoffice-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-libreoffice (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), libreoffice-core (<< 1:${basis-version}), libreoffice-core (>= 1:${next-basis-version}~), libreoffice-writer2latex (<< 1.0-5), libreoffice-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), libtextcat-data
Provides: libreoffice2-common, libreoffice-l10n-en-us
-Replaces: libreoffice-debian-files, libreoffice-mimelnk, libreoffice (<< 1.9), libreoffice2-common, libreoffice-l10n-en-us, libreoffice-l10n-en, libreoffice-calc (<< 2.0.4~rc1), libreoffice-base (<< 2.0.4~rc1), libreoffice-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), libreoffice-core (<< 1:3.0.1~rc1-3)
+Replaces: libreoffice-debian-files, libreoffice-mimelnk, libreoffice (<< 1.9), libreoffice2-common, libreoffice-l10n-en-us, libreoffice-l10n-en, libreoffice-calc (<< 2.0.4~rc1), libreoffice-base (<< 2.0.4~rc1), libreoffice-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), libreoffice-core (<< 1:3.0.1~rc1-3), openoffice.org-common (<< 1:3.3.0~)
Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
libreoffice-style-oxygen (<< 1:${basis-version}~),
libreoffice-style-industrial,
@@ -160,7 +160,7 @@
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel], ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreoffice-emailmerge, libreoffice-math
-Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-writer (<< ${binary:Version}), libreoffice-common (<< 1:2.3.1)
+Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-writer (<< ${binary:Version}), libreoffice-common (<< 1:2.3.1), openoffice.org-writer (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files, libreoffice2-writer (<< ${binary:Version}), libreoffice-java-common (<= 1:2.3.1)
Provides: libreoffice2-writer
Suggests: libreoffice-gcj, libreoffice-base
@@ -173,7 +173,7 @@
Package: libreoffice-calc
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
-Replaces: libreoffice2-core (<< 1.9.113-0pre1), libreoffice (<< 1.9), libreoffice-debian-files, libreoffice-core (<= 2.2.0-4), libreoffice2-calc (<< ${binary:Version}), libreoffice-common (<< 2.0.3+2.0.4m179)
+Replaces: libreoffice2-core (<< 1.9.113-0pre1), libreoffice (<< 1.9), libreoffice-debian-files, libreoffice-core (<= 2.2.0-4), libreoffice2-calc (<< ${binary:Version}), libreoffice-common (<< 2.0.3+2.0.4m179), openoffice.org-calc (<< 1:3.3.0~)
Conflicts: libreoffice-bin (<< 1.9), libreoffice-debian-files, libreoffice2-calc (<< ${binary:Version})
Provides: libreoffice2-calc
Description: office productivity suite -- spreadsheet
@@ -185,7 +185,7 @@
Package: libreoffice-impress
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-core (= ${binary:Version}), libreoffice-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-impress (<< ${binary:Version}), libreoffice-common (<< 2.0.3+2.0.4m179)
+Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-impress (<< ${binary:Version}), libreoffice-common (<< 2.0.3+2.0.4m179), openoffice.org-impress (<< 1:3.3.0~)
Provides: libreoffice2-impress
Conflicts: libreoffice-debian-files, libreoffice2-impress (<< ${binary:Version})
Breaks: libreoffice-presenter-console (<< 1.0.3~)
@@ -198,7 +198,7 @@
Package: libreoffice-draw
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-draw (<< ${binary:Version}), libreoffice-core (<< 1:3.1.1~rc1-2), libreoffice-common (<< 2.0.3+2.0.4m179)
+Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-draw (<< ${binary:Version}), libreoffice-core (<< 1:3.1.1~rc1-2), libreoffice-common (<< 2.0.3+2.0.4m179), openoffice.org-draw (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files, libreoffice2-draw (<< ${binary:Version})
Provides: libreoffice2-draw
Description: office productivity suite -- drawing
@@ -210,7 +210,7 @@
Package: libreoffice-math
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-opensymbol (>> 2:2.4.3~)
-Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-math (<< ${binary:Version}), libreoffice-common (<< 2.0.3+2.0.4m179)
+Replaces: libreoffice (<< 1.9), libreoffice-debian-files, libreoffice2-math (<< ${binary:Version}), libreoffice-common (<< 2.0.3+2.0.4m179), openoffice.org-math (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files, libreoffice2-math (<< ${binary:Version})
Provides: libreoffice2-math
Description: office productivity suite -- equation editor
@@ -240,7 +240,7 @@
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
Breaks: libreoffice-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4~)
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, libreoffice-gcj, libreoffice-report-builder
-Replaces: libreoffice-core (<< 2.0.1), libreoffice-common (<< 1.9.113-0pre1), libreoffice-bin (<< 1.9), libreoffice-debian-files, libreoffice2-base (<< ${binary:Version}), libreoffice-java, libreoffice-java-common (= 1:2.3.1-2~bpo40+1), libreoffice-java-common (= 1:2.4.0-4~bpo40+1), libreoffice-java-common (= 1:2.4.1-3~bpo40+1), libreoffice-java-common (= 2.2.0-6~bpo.1), libreoffice-java-common (= 2.2.1-1~bpo.1), libreoffice-java-common (= 2.2.1-9~bpo40+1), libreoffice-calc (<< 1:3.2.0~rc1)
+Replaces: libreoffice-core (<< 2.0.1), libreoffice-common (<< 1.9.113-0pre1), libreoffice-bin (<< 1.9), libreoffice-debian-files, libreoffice2-base (<< ${binary:Version}), libreoffice-java, libreoffice-java-common (= 1:2.3.1-2~bpo40+1), libreoffice-java-common (= 1:2.4.0-4~bpo40+1), libreoffice-java-common (= 1:2.4.1-3~bpo40+1), libreoffice-java-common (= 2.2.0-6~bpo.1), libreoffice-java-common (= 2.2.1-1~bpo.1), libreoffice-java-common (= 2.2.1-9~bpo40+1), libreoffice-calc (<< 1:3.2.0~rc1), openoffice.org-base (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files, libreoffice2-base (<< ${binary:Version}), libreoffice-common (= 2.0.4-4), libreoffice-report-builder (<< 1.2.0~), libreoffice-report-builder-bin (<< 1:3.2.0~)
Provides: libreoffice2-base
Description: office productivity suite -- database
@@ -3635,7 +3635,7 @@
Enhances: libreoffice
Conflicts: libreoffice2-kde (<< ${binary:Version})
Provides: libreoffice2-kde
-Replaces: libreoffice2-kde (<< ${binary:Version})
+Replaces: libreoffice2-kde (<< ${binary:Version}), openoffice.org-kde (<< 1:3.3.0~)
Description: office productivity suite -- KDE integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2010-11-01 22:01:37 +0000
+++ b/control.in 2010-11-01 22:27:15 +0000
@@ -308,7 +308,8 @@
libreoffice-base (<< 2.0.4~rc1),
libreoffice-math (<< 2.0.4~rc1),
broffice.org (<< 2.2.1~rc1-1),
- libreoffice-core (<< 1:3.0.1~rc1-3)
+ libreoffice-core (<< 1:3.0.1~rc1-3),
+ openoffice.org-common (<< 1:3.3.0~)
Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~),
libreofficeVER-style-oxygen (<< 1:${basis-version}~),
libreofficeVER-style-industrial,
@@ -360,7 +361,8 @@
Replaces: libreoffice (<< 1.9),
libreoffice-debian-files,
libreoffice2-writer (<< ${binary:Version}),
- libreoffice-common (<< 1:2.3.1)
+ libreoffice-common (<< 1:2.3.1),
+ openoffice.org-writer (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files,
libreoffice2-writer (<< ${binary:Version}),
libreoffice-java-common (<= 1:2.3.1)
@@ -385,7 +387,8 @@
libreoffice-debian-files,
libreoffice-core (<= 2.2.0-4),
libreoffice2-calc (<< ${binary:Version}),
- libreoffice-common (<< 2.0.3+2.0.4m179)
+ libreoffice-common (<< 2.0.3+2.0.4m179),
+ openoffice.org-calc (<< 1:3.3.0~)
Conflicts: libreoffice-bin (<< 1.9),
libreoffice-debian-files,
libreoffice2-calc (<< ${binary:Version})
@@ -405,7 +408,8 @@
Replaces: libreoffice (<< 1.9),
libreoffice-debian-files,
libreoffice2-impress (<< ${binary:Version}),
- libreoffice-common (<< 2.0.3+2.0.4m179)
+ libreoffice-common (<< 2.0.3+2.0.4m179),
+ openoffice.org-impress (<< 1:3.3.0~)
Provides: libreoffice2-impress
Conflicts: libreoffice-debian-files,
libreoffice2-impress (<< ${binary:Version})
@@ -425,7 +429,8 @@
libreoffice-debian-files,
libreoffice2-draw (<< ${binary:Version}),
libreoffice-core (<< 1:3.1.1~rc1-2),
- libreoffice-common (<< 2.0.3+2.0.4m179)
+ libreoffice-common (<< 2.0.3+2.0.4m179),
+ openoffice.org-draw (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files,
libreoffice2-draw (<< ${binary:Version})
Provides: libreoffice2-draw
@@ -444,7 +449,8 @@
Replaces: libreoffice (<< 1.9),
libreoffice-debian-files,
libreoffice2-math (<< ${binary:Version}),
- libreoffice-common (<< 2.0.3+2.0.4m179)
+ libreoffice-common (<< 2.0.3+2.0.4m179),
+ openoffice.org-math (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files,
libreoffice2-math (<< ${binary:Version})
Provides: libreoffice2-math
@@ -499,7 +505,8 @@
libreoffice-java-common (= 2.2.0-6~bpo.1),
libreoffice-java-common (= 2.2.1-1~bpo.1),
libreoffice-java-common (= 2.2.1-9~bpo40+1),
- libreoffice-calc (<< 1:3.2.0~rc1)
+ libreoffice-calc (<< 1:3.2.0~rc1),
+ openoffice.org-base (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files,
libreoffice2-base (<< ${binary:Version}),
libreoffice-common (= 2.0.4-4),
=== modified file 'control.kde.in'
--- a/control.kde.in 2010-10-12 00:40:55 +0000
+++ b/control.kde.in 2010-11-01 22:27:15 +0000
@@ -11,7 +11,7 @@
Enhances: libreofficeVER
Conflicts: libreoffice2-kde (<< ${binary:Version})
Provides: libreoffice2-kde
-Replaces: libreoffice2-kde (<< ${binary:Version})
+Replaces: libreoffice2-kde (<< ${binary:Version}), openoffice.org-kde (<< 1:3.3.0~)
Description: office productivity suite -- KDE integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
Reply to: