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

Modified Files:
        changelog control control.in 
Log Message:
ugh, 'gimp' exists only in sid currently, build-depend on gimp1.2 | gimp

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- changelog   19 Apr 2004 14:40:20 -0000      1.299
+++ changelog   20 Apr 2004 15:11:14 -0000      1.300
@@ -3,8 +3,10 @@
   * 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]
+    - ugh, "gimp" exists only in sid currently, build-depend on
+      gimp1.2 | gimp [RE]
 
- -- Rene Engelhard <[EMAIL PROTECTED]>  Mon, 19 Apr 2004 16:50:44 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]>  Tue, 20 Apr 2004 15:26:09 +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.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- control.in  19 Apr 2004 14:40:20 -0000      1.127
+++ control.in  20 Apr 2004 15:11:14 -0000      1.128
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL 
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-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-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], gimp1.2 | 
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
 ], 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
 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
 

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- control     19 Apr 2004 14:40:20 -0000      1.160
+++ control     20 Apr 2004 15:11:14 -0000      1.161
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL 
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-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-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], gimp1.2 | 
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
 ], 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
 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
 

Reply via email to