CVS:oo-deb/debian changelog,1.417.2.2,1.417.2.3 control,1.197.2.2,1.197.2.3 control.in,1.164.2.2,1.164.2.3
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5870
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
changelog control control.in
Log Message:
build-dep on libdb4.2++-dev again until I fixed configure to not check for db_cxx.h anymore...
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.2
retrieving revision 1.417.2.3
diff -u -d -r1.417.2.2 -r1.417.2.3
--- changelog 25 Jan 2005 22:44:13 -0000 1.417.2.2
+++ changelog 26 Jan 2005 15:55:33 -0000 1.417.2.3
@@ -11,8 +11,6 @@
- Suggest xlibmesa-gl | libgl1 [RE]
- Conflict against kwin-style-baghira, kwin-baghira (<< 0.6) [RE]
- Suggest openclipart [RE]
- - exchange libdb4.2++-dev builddep with libdb4.2-dev since OOo now
- only uses the C API [RE]
- update dependencies and virtual packages [RE]
* debian/rules:
- readd special-casing of built languages for Debian [RE]
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.164.2.2
retrieving revision 1.164.2.3
diff -u -d -r1.164.2.2 -r1.164.2.3
--- control.in 25 Jan 2005 22:44:15 -0000 1.164.2.2
+++ control.in 26 Jan 2005 15:55:34 -0000 1.164.2.3
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, 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, libdb4.2-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, 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, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
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), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.197.2.2
retrieving revision 1.197.2.3
diff -u -d -r1.197.2.2 -r1.197.2.3
--- control 25 Jan 2005 22:44:14 -0000 1.197.2.2
+++ control 26 Jan 2005 15:55:33 -0000 1.197.2.3
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, 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, libdb4.2-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, 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, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
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), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Reply to: