CVS:oo-deb/debian changelog,1.338.2.25.2.23,1.338.2.25.2.24 control,1.175.2.8.2.12,1.175.2.8.2.13 control.in,1.142.2.6.2.13,1.142.2.6.2.14

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

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

Modified Files:
      Tag: OPENOFFICE_ORG680
	changelog control control.in 
Log Message:
- add libsndfile1-dev to Build-Depends
- update changelog


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.23
retrieving revision 1.338.2.25.2.24
diff -u -d -r1.338.2.25.2.23 -r1.338.2.25.2.24
--- changelog	16 Mar 2005 00:25:23 -0000	1.338.2.25.2.23
+++ changelog	16 Mar 2005 04:27:47 -0000	1.338.2.25.2.24
@@ -8,14 +8,19 @@
    - install Javafilters (gid_Module_Optional_Javafilter) [RE]
      (closes: #266889, #222984)
    - pyuno installation enhancements [RE]
-   - install oobase wrapper [RE]
+   - install oobase wrapper and some ooo-build utilities [RE]
+  * ooo-build/distro-configs/Debian.conf.in: [RE]
+    - update; use system libs where possible (C vs. C++)
+    - --with-java=gij-4.0 --with-ant-home=/usr/share/ant1.6
+    - --enable-pasf --with-system-sndfile
+    - --enable-openldap, build LDAP backend with OpenLDAP, not Mozilla
   * build with java, use gij/gcj.
     (closes: #289542, #265134)
   * debian/control.in:
     - add Build-Depends: gij-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7),
       g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev,
-      libexpat1-dev, libbgnomevfs2-dev, libant1.6-java, fastjar,
-      gjdoc [RE]
+      libexpat1-dev, libbgnomevfs2-dev, libsndfile1-dev, libant1.6-java,
+      fastjar, gjdoc [RE]
     - (temporarily) remove unneeded/-used (libstlport4.6, libdb4.2++-dev,
       libmyspell-dev, libaltlinuxhyph-dev, ..) or obsolete
       (libart-2.0-dev, xsltproc, evolution-data-server-dev, ...)
@@ -29,6 +34,8 @@
       it has no .shlibs (and no real SONAME anyway...)... [RE]
     - Suggest openoffice.org2-thesaurus, format changed... [RE]
   * debian/rules:
+   - remove CONFIGURE_OPTIONS, now done by ooo-build and
+     distro-configs/Debian.conf[.in] [RE]
    - compress manpages... [RE]
    - install libstdc++.so.6 and libgcc_s.so.1 into $OODIR/program
      in a try to be installable in unstable [RE]
@@ -48,7 +55,7 @@
     and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again
     Matthias Klose [RE]
 
- -- Rene Engelhard <rene@debian.org>  Tue, 15 Mar 2005 22:10:32 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 16 Mar 2005 05:19:50 +0100
 
 openoffice.org2 (1.9.76-0pre) experimental; urgency=low
 

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.13
retrieving revision 1.142.2.6.2.14
diff -u -d -r1.142.2.6.2.13 -r1.142.2.6.2.14
--- control.in	15 Mar 2005 23:56:38 -0000	1.142.2.6.2.13
+++ control.in	16 Mar 2005 04:27:47 -0000	1.142.2.6.2.14
@@ -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++-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, imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), 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-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, imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), 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, libsndfile1-dev
 Standards-Version: 3.6.1
 
 Package: openoffice.orgVER

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.12
retrieving revision 1.175.2.8.2.13
diff -u -d -r1.175.2.8.2.12 -r1.175.2.8.2.13
--- control	15 Mar 2005 23:56:37 -0000	1.175.2.8.2.12
+++ control	16 Mar 2005 04:27:47 -0000	1.175.2.8.2.13
@@ -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++-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, imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), 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-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, imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), 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, libsndfile1-dev
 Standards-Version: 3.6.1
 
 Package: openoffice.org2