CVS:oo-deb/debian changelog,1.252,1.253 control,1.144,1.145 control.in,1.112,1.113 rules,1.177,1.178 setperms,1.7,1.8

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

Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv11868/debian

Modified Files:
	changelog control control.in rules setperms 
Log Message:
- fix typo in nas' changelog entry and enhance it
- shorten the config-switches changelog entry
- mention myspell and altlinuxhyph patches; add libaltlinuxhyph-dev
  and libmyspell-dev (>= 1:3.1-1) to Build-Depends:, libhnj-dev to
  Build-Conflicts: (they are not yet in Debian but hopefully will be
  shortly; the myspell2 now works too, but not dynamically, for what 3.1 is
  needed and what we want. altlinuxhyph is available from
  http://people.debian.org/~rene/openoffice.org/altlinuxhyph/ until
  it is out of NEW
- generate a list in openoffice.org-bin which contains used libs which
  then can used from oooprelink
- openoffice.org Suggests: www-browser, libxrender1
- fix Build-Depends: to not be confusing for dpkg-checkbuilddeps
- s/with-system-sane/with-system-sane-headers/
- remove obsolete section in debian/rules


Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- changelog	23 Dec 2003 00:07:41 -0000	1.252
+++ changelog	5 Jan 2004 02:55:12 -0000	1.253
@@ -8,31 +8,42 @@
     - nswrapper-mozilla-not-netscape: run mozilla in nswrapper.sh, not
       netscape, patch taken from SuSE [RE]
     - system-db: build with system libdb3 [RE]
-    - systen-nas: build with system libaudio [RE]
+    - system-nas: build and link dynamically with system libaudio [RE]
     - system-sane: build with system sane.h [RE]
     - system-freetype: merged patch; use system freetype and fix for freetype
       2.1.7 [RE]
     - system-curl: build with system curl [RE]
+    - system-myspell: build and link dynamically with system myspell [RE]
+    - system-altlinuxhyph: build with system altlinuxhyph (statically for now
+      since there is no dynamic one) [RE]
   * Modified patches:
-    - config-switches.diff: add --with-system-{db,nas,freetype,sane,curl} [RE]
+    - config-switches.diff: add new --with-system-* flags [RE]
   * debian/rules:
     - Fix uudecode/encoding of OpenSymbol font [CH]
     - select DebianWoody patchset for builds on woody [CH]
     - --with-system-db --with-system-nas --with-system-freetype (except on
       woody), --with-system-sane, --with-system-curl
+    - generate a list in openoffice.org-bin which contains used libs which
+      then can used from oooprelink [RE]
   * debian/control.in:
     - Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
       support now (thanks to Ozgur Murat Homurlu) [CH]
-    - Suggests: www-browser [RE]
+    - openoffice.org Suggests: www-browser, libxrender1 [RE]
     - Build-Depends:
       + add xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc] [RE]
       + add libdb3++-dev [RE]
       + add libaudio-dev | nas-dev [RE]
-      + add xlibs-dev | (libx11-dev, libsm-dev, libxt-dev, libxext-dev,
-        libice-dev) for not requiring xlibs-dev when it is only a
-        metapackage (as in X > 4.3.0-0pre1v5) [RE]
+      + add xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev |
+        libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev
+        for not requiring xlibs-dev when it is only a metapackage
+        (as in X > 4.3.0-0pre1v5) and the splitted packages only are
+        installed [RE]
       + add libsane-dev [RE]
       + add libcurl2-dev | libcurl-dev [RE]
+      + add libmyspell-dev (>= 1:3.1-1) [RE]
+      + add libaltlinuxhyph-dev - add libhnj-dev to Build-Conflicts: [RE]
+  * debian/scripts/*:
+    - add gen_lib_list [RE]
   * debian/MANIFEST.*:
     - remove curl and db pieces [RE]
   * debian/openoffice.org*.install:
@@ -44,7 +55,7 @@
   * ooo-build/patches/OOO_1_1_0/apply:
     - add a second patchset, DebianWoody [CH, RE]
 
- -- Rene Engelhard <rene@debian.org>  Mon, 22 Dec 2003 20:32:53 +0100
+ -- Rene Engelhard <rene@debian.org>  Mon,  5 Jan 2004 02:53:02 +0100
 
 openoffice.org (1.1.0-3) unstable; urgency=low
 

Index: setperms
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/setperms,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- setperms	13 Oct 2003 16:43:22 -0000	1.7
+++ setperms	5 Jan 2004 02:55:12 -0000	1.8
@@ -8,6 +8,7 @@
 	    scripts/installoverrides \
 	    scripts/xcftobmp \
 	    scripts/oo-xvfb-run \
+	    scripts/gen_lib_list \
             local/openoffice-*-lang 
 do
   chmod 755 $FILE

Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- control.in	22 Dec 2003 21:31:52 -0000	1.112
+++ control.in	5 Jan 2004 02:55:12 -0000	1.113
@@ -3,14 +3,15 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-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.13), 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-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | (libx11-dev, libsm-dev, libxt-dev. libxext-dev. libice-dev), libsane-dev, libcurl2-dev | libcurl-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.13), 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-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, 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 | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
+Build-Conflicts: libhnj-dev
 Standards-Version: 3.5.6
 
 Package: openoffice.org
 Architecture: all
 Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final, dictionaries-common (>= 0.10) | openoffice.org-updatedicts${debianutils-depends}
 Recommends: openoffice.org-mimelnk
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, www-browser
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, www-browser, libxrender1
 Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n, openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6), openoffice.org-spellcheck-de-ch (<= 20020701-6), openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es (<=  0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
 Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
 Provides: openoffice.org1.1, openoffice.org-thesaurus-en, openoffice.org-thesaurus, openoffice-de-en, openoffice-de
@@ -31,6 +32,7 @@
   * cupsys-bsd: Allows OpenOffice.org to detect your CUPS printer queues
      automatically
   * libsane: Use your sane-supported scanner with OpenOffice.org
+  * libxrender1: Speed up display by using Xrender library
  .
  See README.Debian for information about using OpenOffice.org in Debian, known
  bugs and workarounds.  More information about the Debian packages is available

Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- control	22 Dec 2003 21:31:51 -0000	1.144
+++ control	5 Jan 2004 02:55:12 -0000	1.145
@@ -3,14 +3,15 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-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.13), 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-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | (libx11-dev, libsm-dev, libxt-dev. libxext-dev. libice-dev), libsane-dev, libcurl2-dev | libcurl-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.13), 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-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, 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 | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
+Build-Conflicts: libhnj-dev
 Standards-Version: 3.5.6
 
 Package: openoffice.org
 Architecture: all
 Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final, dictionaries-common (>= 0.10) | openoffice.org-updatedicts${debianutils-depends}
 Recommends: openoffice.org-mimelnk
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, www-browser
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, www-browser, libxrender1
 Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n, openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6), openoffice.org-spellcheck-de-ch (<= 20020701-6), openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es (<=  0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
 Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
 Provides: openoffice.org1.1, openoffice.org-thesaurus-en, openoffice.org-thesaurus, openoffice-de-en, openoffice-de
@@ -31,6 +32,7 @@
   * cupsys-bsd: Allows OpenOffice.org to detect your CUPS printer queues
      automatically
   * libsane: Use your sane-supported scanner with OpenOffice.org
+  * libxrender1: Speed up display by using Xrender library
  .
  See README.Debian for information about using OpenOffice.org in Debian, known
  bugs and workarounds.  More information about the Debian packages is available

Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- rules	22 Dec 2003 21:31:52 -0000	1.177
+++ rules	5 Jan 2004 02:55:12 -0000	1.178
@@ -52,7 +52,7 @@
 	         --with-system-zlib \
 		 --with-system-db --with-db-version=$(D) \
 		 --with-system-nas \
-		 --with-system-sane \
+		 --with-system-sane-headers \
 		 --with-system-curl
 
 # If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
@@ -326,7 +326,7 @@
 	    dmake distclean; \
 	fi
 
-	# remove xcf and bmp from the Debian splashscreen
+	# remove xcf and bmp of the Debian splashscreen
 	rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \
 		offmgr/res/openintro_debian.bmp
 
@@ -503,12 +503,6 @@
 	# In the 1.0.1 tarball, some scripts are not executable
 	#chmod ugo+x $(SOURCE_TREE)/solenv/bin/*.pl
 
-ifeq "$(HAVE_DMAKE_PKG)" "n"
-	# we patched dmake - run autoconf
-	cd $(SOURCE_TREE)/dmake && \
-	  autoconf
-endif
-
         # uudecode OpenSymbol font
 	if [ ! -s $(OOO_BUILD)/fonts/opens___.ttf ]; then \
 	  uudecode -o $(OOO_BUILD)/fonts/opens___.ttf \
@@ -1026,6 +1020,8 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps -X msgbox-gnome -X getstyle-gnome $(SHLIBS_OVERRIDE)
+	debian/scripts/gen_lib_list \
+	 > debian/openoffice.org-bin/usr/share/doc/openoffice.org-bin/used_libs
 # This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
 # causes ldd crashes sometimes when used with fakeroot:
 #          -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program