CVS:oo-deb/debian changelog,1.320,1.321 control,1.166,1.167 control.in,1.133,1.134
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv3048
Modified Files:
changelog control control.in
Log Message:
- mention psprint-cups; add libcupsys2-dev to Build-Depends:
- tighten interpackage-depends
- urgency=medium because of the FTBFSes
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- changelog 16 May 2004 15:22:04 -0000 1.320
+++ changelog 18 May 2004 13:41:23 -0000 1.321
@@ -1,4 +1,4 @@
-openoffice.org (1.1.1-2.3pre) unstable; urgency=low
+openoffice.org (1.1.1-2.3pre) unstable; urgency=medium
* New patches:
- print-resolution-generic: improve generic printer, resolution [MM]
@@ -10,6 +10,7 @@
- setup-upgrade,license: No click-through license screen, upgrade from
1.1.0 properly [MM]
- Various other SuSE patches merged, see changelog.ooo-build.gz [MM]
+ - psprint-cups: Backport native CUPS support upstream 2.0 [CH]
* Modified patches:
- print-fontconfig: Fix broken afm metrics on Woody backport [CH]
- system-db: fix again for Java case. $(CC) -E apparently doesn't like
@@ -17,6 +18,8 @@
* debian/control.in:
- extend build-conflicts on libart, 2.3.16-4 too is broken.
2.3.13 introduced new functions. build-conflict on 2.3.16-4... [RE]
+ - tighten Depends: openoffice.org Depends: openoffice.org-bin (>= 1.1.1-3)
+ and vice versa [RE]
- Build-Depends:
+ ugh, "gimp" exists only in sid currently, build-depend on
gimp | gimp1.2 [RE]
@@ -26,6 +29,7 @@
+ do not require python-dev on woody [RE]
+ add libneon23-dev | g++-3.0 [!powerpc] [RE]
+ add libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc] [RE]
+ + add libcupsys2-dev [RE]
* debian/rules:
- add support for building using KDE icon set, use
DEB_BUILD_OPTIONS=kdeicons [CH]
@@ -56,7 +60,7 @@
* debian/openintro_debian.xcf.uu: modified for better text and Debian logo
alignment [MK]
- -- Rene Engelhard <rene@debian.org> Sun, 16 May 2004 15:35:59 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 18 May 2004 15:40:11 +0200
openoffice.org (1.1.1-2) unstable; urgency=high
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- control.in 5 May 2004 21:23:24 -0000 1.133
+++ control.in 18 May 2004 13:41:23 -0000 1.134
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc]
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc], libcupsys2-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3), libart-2.0-dev (= 2.3.16-4)
Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.0+1.1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.1-3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts, openoffice.org-mimelnk
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n, openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6), openoffice.org-spellcheck-de-ch (<= 20020701-6), openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es (<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2), openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -40,7 +40,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.0+1.1.1rc3)${java-additional-depends}
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.1-3)${java-additional-depends}
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- control 5 May 2004 21:23:24 -0000 1.166
+++ control 18 May 2004 13:41:23 -0000 1.167
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc]
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc], libcupsys2-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3), libart-2.0-dev (= 2.3.16-4)
Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.0+1.1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.1-3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts, openoffice.org-mimelnk
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n, openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6), openoffice.org-spellcheck-de-ch (<= 20020701-6), openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es (<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2), openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -40,7 +40,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.0+1.1.1rc3)${java-additional-depends}
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.1-3)${java-additional-depends}
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
Reply to: