[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian MANIFEST.i386,1.25,1.26 MANIFEST.powerpc,1.29,1.30 MANIFEST.s390,1.17,1.18 MANIFEST.sparc,1.6,1.7 changelog,1.245,1.246 control,1.140,1.141 control.in,1.108,1.109 openoffice.org-bin.install,1.17,1.18 openoffice.org-bin.templates.master,1.5,1.6 rules,1.171,1.172

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

Modified Files:
	MANIFEST.i386 MANIFEST.powerpc MANIFEST.s390 MANIFEST.sparc 
	changelog control control.in openoffice.org-bin.install 
	openoffice.org-bin.templates.master rules 
Log Message:
- mention new patches
- --with-system-freetype (ecept on woody), --with-system-nas, --with-system-db
  update MANIFEST.*, *.install and Build-Depends accordingly
- changelog fixes
- suggest x-www-browser
- make builddeps be nicer for X 4.3 since xlibs-dev there is a metapackage
- add xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc] to Build-Depends:


Index: MANIFEST.sparc
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.sparc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MANIFEST.sparc	27 Oct 2003 09:46:51 -0000	1.6
+++ MANIFEST.sparc	11 Dec 2003 16:44:32 -0000	1.7
@@ -126,7 +126,6 @@
 usr/lib/openoffice/program/filter/libera645ls.so
 usr/lib/openoffice/program/filter/libeti645ls.so
 usr/lib/openoffice/program/filter/libexp645ls.so
-usr/lib/openoffice/program/filter/libfreetype.so.6
 usr/lib/openoffice/program/filter/libicd645ls.so
 usr/lib/openoffice/program/filter/libicg645ls.so
 usr/lib/openoffice/program/filter/libidx645ls.so
@@ -168,8 +167,6 @@
 usr/lib/openoffice/program/libctl645ls.so
 usr/lib/openoffice/program/libcurl.so
 usr/lib/openoffice/program/libdate645ls.so
-usr/lib/openoffice/program/libdb-3.2.so
-usr/lib/openoffice/program/libdb_cxx-3.2.so
 usr/lib/openoffice/program/libdba645ls.so
 usr/lib/openoffice/program/libdbase645ls.so
 usr/lib/openoffice/program/libdbi645ls.so

Index: MANIFEST.powerpc
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.powerpc,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- MANIFEST.powerpc	27 Oct 2003 09:46:51 -0000	1.29
+++ MANIFEST.powerpc	11 Dec 2003 16:44:32 -0000	1.30
@@ -126,7 +126,6 @@
 usr/lib/openoffice/program/filter/libera645lp.so
 usr/lib/openoffice/program/filter/libeti645lp.so
 usr/lib/openoffice/program/filter/libexp645lp.so
-usr/lib/openoffice/program/filter/libfreetype.so.6
 usr/lib/openoffice/program/filter/libicd645lp.so
 usr/lib/openoffice/program/filter/libicg645lp.so
 usr/lib/openoffice/program/filter/libidx645lp.so
@@ -168,8 +167,6 @@
 usr/lib/openoffice/program/libctl645lp.so
 usr/lib/openoffice/program/libcurl.so
 usr/lib/openoffice/program/libdate645lp.so
-usr/lib/openoffice/program/libdb-3.2.so
-usr/lib/openoffice/program/libdb_cxx-3.2.so
 usr/lib/openoffice/program/libdba645lp.so
 usr/lib/openoffice/program/libdbase645lp.so
 usr/lib/openoffice/program/libdbi645lp.so

Index: MANIFEST.i386
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.i386,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- MANIFEST.i386	27 Oct 2003 09:46:51 -0000	1.25
+++ MANIFEST.i386	11 Dec 2003 16:44:32 -0000	1.26
@@ -167,7 +167,6 @@
 usr/lib/openoffice/program/filter/libera645li.so
 usr/lib/openoffice/program/filter/libeti645li.so
 usr/lib/openoffice/program/filter/libexp645li.so
-usr/lib/openoffice/program/filter/libfreetype.so.6
 usr/lib/openoffice/program/filter/libicd645li.so
 usr/lib/openoffice/program/filter/libicg645li.so
 usr/lib/openoffice/program/filter/libidx645li.so
@@ -209,8 +208,6 @@
 usr/lib/openoffice/program/libctl645li.so
 usr/lib/openoffice/program/libcurl.so
 usr/lib/openoffice/program/libdate645li.so
-usr/lib/openoffice/program/libdb-3.2.so
-usr/lib/openoffice/program/libdb_cxx-3.2.so
 usr/lib/openoffice/program/libdba645li.so
 usr/lib/openoffice/program/libdbase645li.so
 usr/lib/openoffice/program/libdbi645li.so

Index: MANIFEST.s390
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.s390,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- MANIFEST.s390	27 Oct 2003 09:46:51 -0000	1.17
+++ MANIFEST.s390	11 Dec 2003 16:44:32 -0000	1.18
@@ -126,7 +126,6 @@
 usr/lib/openoffice/program/filter/libera645l3.so
 usr/lib/openoffice/program/filter/libeti645l3.so
 usr/lib/openoffice/program/filter/libexp645l3.so
-usr/lib/openoffice/program/filter/libfreetype.so.6
 usr/lib/openoffice/program/filter/libicd645l3.so
 usr/lib/openoffice/program/filter/libicg645l3.so
 usr/lib/openoffice/program/filter/libidx645l3.so
@@ -168,8 +167,6 @@
 usr/lib/openoffice/program/libctl645l3.so
 usr/lib/openoffice/program/libcurl.so
 usr/lib/openoffice/program/libdate645l3.so
-usr/lib/openoffice/program/libdb-3.2.so
-usr/lib/openoffice/program/libdb_cxx-3.2.so
 usr/lib/openoffice/program/libdba645l3.so
 usr/lib/openoffice/program/libdbase645l3.so
 usr/lib/openoffice/program/libdbi645l3.so

Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- control.in	11 Dec 2003 12:54:57 -0000	1.108
+++ control.in	11 Dec 2003 16:44:32 -0000	1.109
@@ -3,14 +3,14 @@
 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]
+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)
 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
 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
+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, x-www-browser
 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

Index: openoffice.org-bin.templates.master
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/openoffice.org-bin.templates.master,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- openoffice.org-bin.templates.master	25 Aug 2003 15:21:03 -0000	1.5
+++ openoffice.org-bin.templates.master	11 Dec 2003 16:44:32 -0000	1.6
@@ -14,5 +14,3 @@
  until the prelinking is undone.
  .
  You need to undo prelinking with 'dpkg-reconfigure openoffice.org-bin'.
- .
- Should OpenOffice.org be prelinked?

Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- changelog	11 Dec 2003 13:00:42 -0000	1.245
+++ changelog	11 Dec 2003 16:44:32 -0000	1.246
@@ -1,17 +1,36 @@
 openoffice.org (1.1.0-3.pre4) unstable; urgency=low
 
+  * New patches:
+    - xinerama-pic-on-all-archs: build with libXinerama_pic.a on all archs
+      when building with it available [RE]
+    - x-www-browser-alternative: use x-www-browser-alternative for external
+      programs (HTTP/HTTPS/FTP) (closes: #222625) [RE]
+    - system-db: build with system libdb3 [RE]
+    - systen-nas: build with system libaudio [RE]
+    - nswrapper-mozilla-not-netscape: run mozilla in nswrapper.sh, not
+      netscape, patch taken from SuSE [RE]
   * debian/rules:
     - Fix uudecode/encoding of OpenSymbol font [CH]
-    - select DebianWoody patchset for builds without the system
-      libfreetype [CH]
+    - select DebianWoody patchset for builds on woody [CH]
+    - --with-system-db --with-system-nas --with-system-freetype (except on
+      woody)
   * debian/control.in:
     - Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
       support now (thanks to Ozgur Murat Homurlu) [CH]
+    - Suggests: x-www-browser [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]
+  * debian/openoffice.org-bin.templates.master:
+     - remove unnecessary question from template (closes: #223304) [RE]
   * ooo-build/patches/OOO_1_1_0/apply:
-    - add a second patchset, DebianWoody, that excludes
-      the system libfreetype patch [CH]
+     - add a second patchset, DebianWoody [CH, RE]
 
- -- Chris Halls <halls@debian.org>  Wed,  3 Dec 2003 15:08:18 +0100
+ -- Rene Engelhard <rene@debian.org>  Thu, 11 Dec 2003 15:18:18 +0100
 
 openoffice.org (1.1.0-3) unstable; urgency=low
 

Index: openoffice.org-bin.install
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/openoffice.org-bin.install,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- openoffice.org-bin.install	11 Nov 2003 14:16:43 -0000	1.17
+++ openoffice.org-bin.install	11 Dec 2003 16:44:32 -0000	1.18
@@ -49,8 +49,6 @@
 usr/lib/openoffice/program/libctl645l[ips3].so
 usr/lib/openoffice/program/libcurl.so
 usr/lib/openoffice/program/libdate645l[ips3].so
-usr/lib/openoffice/program/libdb-3.2.so
-usr/lib/openoffice/program/libdb_cxx-3.2.so
 usr/lib/openoffice/program/libdba645l[ips3].so
 usr/lib/openoffice/program/libdbase645l[ips3].so
 usr/lib/openoffice/program/libdbi645l[ips3].so

Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- rules	11 Dec 2003 13:00:42 -0000	1.171
+++ rules	11 Dec 2003 16:44:32 -0000	1.172
@@ -144,6 +144,9 @@
 # freetype and it all ends up in a horrible mess.
 ifeq (libfreetype.so.6.3.0,$(shell readlink /usr/lib/libfreetype.so))
   USE_INTERNAL_FREETYPE=y
+else
+  USE_INTERNAL_FREETYPE=n
+  CONFIGURE_FLAGS += --with-system-freetype
 endif
 
 # do we have po-debconf available?

Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- control	11 Dec 2003 12:54:57 -0000	1.140
+++ control	11 Dec 2003 16:44:32 -0000	1.141
@@ -3,14 +3,14 @@
 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]
+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)
 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
 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
+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, x-www-browser
 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
Reply to: