Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv2763
Modified Files:
changelog control control.in
Log Message:
use gimp | gimp1.2; reverse slibs-dev | libxext-dev et al. builddeps, remove
xlibs-pic (>= 4.2.1-6) part since it is a metapackage and we already have
xlibs-static-pic there
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- changelog 20 Apr 2004 15:11:14 -0000 1.300
+++ changelog 20 Apr 2004 15:19:25 -0000 1.301
@@ -4,9 +4,12 @@
- 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]
+ gimp | gimp1.2 [RE]
+ - reverse xlibs-dev | libxext-dev et al. builddeps in spirit of
+ the xlibs-split, remove unneccessary xlibs-pic (>= 4.2.1-6) piece
+ since it is a metapackage and we already have xlibs-static-pic there [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 20 Apr 2004 15:26:09 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 20 Apr 2004 17:18:16 +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.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- control.in 20 Apr 2004 15:11:14 -0000 1.128
+++ control.in 20 Apr 2004 15:19:25 -0000 1.129
@@ -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], 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-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
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.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- control 20 Apr 2004 15:11:14 -0000 1.161
+++ control 20 Apr 2004 15:19:25 -0000 1.162
@@ -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], 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-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
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
