CVS:oo-deb/debian changelog,1.265,1.266 control,1.148,1.149 control.in,1.115,1.116
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv29333
Modified Files:
changelog control control.in
Log Message:
fix Build-Conflicts: - add missing = and the necessary epoch to g++-3.3
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- changelog 28 Jan 2004 13:59:06 -0000 1.265
+++ changelog 28 Jan 2004 21:20:44 -0000 1.266
@@ -7,11 +7,11 @@
- psprint-handle-no-solar-java: Patch did not apply as indended,
fixed [CH]
* debian/control.in:
- - Build-Conflicts: g++-3.3 (3.3.3-0pre1) due to enum failure [CH]
+ - Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre1) due to enum failure [CH, RE]
- openoffice.org Conflicts with old package openoffice.org-gnome [CH]
- Mention prelink in description (closes: #229564) [CH]
- -- Rene Engelhard <rene@debian.org> Sun, 18 Jan 2004 19:10:47 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 28 Jan 2004 22:16:39 +0100
openoffice.org (1.1.0-5) unstable; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- control.in 28 Jan 2004 13:59:06 -0000 1.115
+++ control.in 28 Jan 2004 21:20:44 -0000 1.116
@@ -4,7 +4,7 @@
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.13), 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-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev, g++-3.3 (3.3.3-0pre1)
+Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
Package: openoffice.org
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- control 28 Jan 2004 13:59:06 -0000 1.148
+++ control 28 Jan 2004 21:20:44 -0000 1.149
@@ -4,7 +4,7 @@
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.13), 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-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev, g++-3.3 (3.3.3-0pre1)
+Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
Package: openoffice.org
Reply to: