CVS:oo-deb/debian changelog,1.298,1.299 control,1.159,1.160 control.in,1.126,1.127
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv25334
Modified Files:
changelog control control.in
Log Message:
extend build-conflicts on libart
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- changelog 17 Apr 2004 15:32:27 -0000 1.298
+++ changelog 19 Apr 2004 14:40:20 -0000 1.299
@@ -1,3 +1,11 @@
+openoffice.org (1.1.1-3.4pre) unstable; urgency=low
+
+ * 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]
+
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Apr 2004 16:50:44 +0200
+
openoffice.org (1.1.1-2) unstable; urgency=high
* Urgency because of FTBFS and security-bug....
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- control.in 15 Apr 2004 21:21:29 -0000 1.126
+++ control.in 19 Apr 2004 14:40:20 -0000 1.127
@@ -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.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, 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-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 (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltl
inuxhyph-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
-Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3)
+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
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- control 15 Apr 2004 21:21:29 -0000 1.159
+++ control 19 Apr 2004 14:40:20 -0000 1.160
@@ -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.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, 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-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 (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltl
inuxhyph-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
-Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3)
+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
Reply to: