Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv16841
Modified Files:
Tag: OPENOFFICE_ORG680
changelog control control.in
Log Message:
typo fix, actually add new builddeps, remove sablot stuff again (C++...)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.11
retrieving revision 1.338.2.25.2.12
diff -u -d -r1.338.2.25.2.11 -r1.338.2.25.2.12
--- changelog 13 Mar 2005 19:25:17 -0000 1.338.2.25.2.11
+++ changelog 13 Mar 2005 19:29:18 -0000 1.338.2.25.2.12
@@ -4,8 +4,8 @@
- now uses libneon24 (closes: #251738)
* build with java, use gij/gcj.
* add Build-Depends: gij-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7),
- g++ (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev, libsablot0-dev,
- sablotron, libexpat1-dev, libbgnomevfs2-dev, libant1.6-java, fastjar,
+ g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev,
+ libexpat1-dev, libbgnomevfs2-dev, libant1.6-java, fastjar,
gjdoc [RE]
* build-depend on libneon24-dev instead of libneon23-dev [RE]
* version libnss-dev builddep (>= 1.7.5-1) [RE]
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.9
retrieving revision 1.142.2.6.2.10
diff -u -d -r1.142.2.6.2.9 -r1.142.2.6.2.10
--- control.in 13 Mar 2005 19:25:17 -0000 1.142.2.6.2.9
+++ control.in 13 Mar 2005 19:29:19 -0000 1.142.2.6.2.10
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-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], zlib1g-dev, 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, libneon24-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev,
xlibs-dev%
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7),
gij-4.0 (>= 4.0-0pre7)) 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], zlib1g-dev, 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, libneon24-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release
, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
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-1)
Standards-Version: 3.6.1
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.8
retrieving revision 1.175.2.8.2.9
diff -u -d -r1.175.2.8.2.8 -r1.175.2.8.2.9
--- control 13 Mar 2005 19:25:17 -0000 1.175.2.8.2.8
+++ control 13 Mar 2005 19:29:19 -0000 1.175.2.8.2.9
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-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], zlib1g-dev, 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, libneon24-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7),
gij-4.0 (>= 4.0-0pre7)) 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], zlib1g-dev, 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, libneon24-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release
, rpm , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc,
fastjar
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-1)
Standards-Version: 3.6.1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
