CVS:oo-deb/debian changelog,1.296,1.297 control.in,1.124,1.125 control,1.157,1.158

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6621

Modified Files:
	changelog control.in control 
Log Message:
- Build-Conflict: on libart-2.0-dev (= 2.3.16-3) because it lost his
  shlibs versioning in this version...


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- changelog	15 Apr 2004 12:50:12 -0000	1.296
+++ changelog	15 Apr 2004 21:07:03 -0000	1.297
@@ -26,6 +26,8 @@
     - Standards-Version: 3.6.1 (no changes needed)
     - build-depend on gimp instead of gimp-perl, we now use script-fu [RE]
     - add python-dev to Build-Depends: [RE]
+    - Build-Conflict: on libart-2.0-dev (= 2.3.16-3) because it lost his
+      shlibs versioning in this version... [RE]
   * debian/rules:
     - disable use of external libdb and libmyspell for woody builds,
       it won't work because we have to use g++-3.0 on woody and libdb3_cxx is
@@ -47,7 +49,7 @@
   * debian/scripts/vars:
     - use ooo-icons -9 [RE]
 
- -- Rene Engelhard <rene@debian.org>  Thu, 15 Apr 2004 14:19:02 +0200
+ -- Rene Engelhard <rene@debian.org>  Thu, 15 Apr 2004 18:35:48 +0200
 
 openoffice.org (1.1.1-1) unstable; urgency=low
 

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- control.in	12 Apr 2004 15:18:09 -0000	1.124
+++ control.in	15 Apr 2004 21:07:03 -0000	1.125
@@ -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)
+Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (>= 2.3.16-3)
 Standards-Version: 3.6.1
 
 Package: openoffice.org

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- control	12 Apr 2004 15:18:09 -0000	1.157
+++ control	15 Apr 2004 21:07:03 -0000	1.158
@@ -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)
+Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (>= 2.3.16-3)
 Standards-Version: 3.6.1
 
 Package: openoffice.org