CVS:oo-deb/debian changelog,1.248,1.249 control,1.142,1.143 control.in,1.110,1.111 rules,1.175,1.176
Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv9686
Modified Files:
changelog control control.in rules
Log Message:
- mention new and modified patches
- add libsane-dev to Build-Depends:
- --with-system-sane
- Suggest only www-browser
- mention the prelink question change
- delete two generated files in clean
- remove templates/*.s* too in clean, dpkg-source strikes again.
Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- rules 17 Dec 2003 12:15:43 -0000 1.175
+++ rules 21 Dec 2003 20:07:37 -0000 1.176
@@ -51,7 +51,8 @@
--without-fonts \
--with-system-zlib \
--with-system-db --with-db-version=$(D) \
- --with-system-nas
+ --with-system-nas \
+ --with-system-sane
# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.
@@ -109,6 +110,7 @@
USE_FONTCONFIG=y
CONFIGURE_FLAGS+= --enable-fontconfig
PATCHSET=Debian
+ DEBIANUTILSDEPENDS=, debianutils (>= 2.0)
else
# use latest gcc-3.x compiler version
_CC:=$(shell cd /usr/bin; ls gcc-3.* | tail -1)
@@ -310,7 +312,8 @@
#
# we do not need them and they make problem with dpkg-source....
- rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png
+ rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
+ $(OOO_BUILD)/templates/*.s*
cd $(SOURCE_TREE)/config_office && \
rm -f config.cache config.log \
@@ -381,6 +384,9 @@
rm -f makefile.mk $(ENVFILE) $(ENVFILE).langpacks $(subst Env.Set.sh,Env.Set,$(ENVFILE)) \
bootstrap
+ rm -f berkeleydb/prj/d.lst
+ rm -f extensions/prj/build.lst
+
$(MAKE) -f debian/rules control
@@ -1023,7 +1029,8 @@
# 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
- dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))'
+ dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
+ -V'debianutils-depends=$(DEBIANUTILSDEPENDS)'
dh_md5sums
dh_builddeb
Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- control.in 13 Dec 2003 15:49:01 -0000 1.110
+++ control.in 21 Dec 2003 20:07:37 -0000 1.111
@@ -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], 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)
+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
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
+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 | x-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
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: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- changelog 13 Dec 2003 15:49:01 -0000 1.248
+++ changelog 21 Dec 2003 20:07:37 -0000 1.249
@@ -3,21 +3,26 @@
* 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]
+ - sensible-browser: call sensible-browser 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]
+ - system-sane: build with system sane.h [RE]
+ - system-freetype: merged patch; use sytem freetype and fix for freetype
+ 2.1.7 [RE]
+ * Modified patches:
+ - config-switches.diff: add --with-system-{db,nas,freetype,sane} [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)
+ woody), --with-system-sane
* debian/control.in:
- Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
support now (thanks to Ozgur Murat Homurlu) [CH]
- - Suggests: www-browser | x-www-browser [RE]
+ - Suggests: www-browser [RE]
- Build-Depends:
+ add xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc] [RE]
+ add libdb3++-dev [RE]
@@ -25,12 +30,15 @@
+ 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 libsane-dev [RE]
+ * debian/openoffice.org-bin.config:
+ - ask prelink question only if prelink is installed, thanks nobse [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 [CH, RE]
- -- Rene Engelhard <rene@debian.org> Thu, 11 Dec 2003 15:18:18 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 21 Dec 2003 16:11:59 +0100
openoffice.org (1.1.0-3) unstable; urgency=low
Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- control 13 Dec 2003 15:49:01 -0000 1.142
+++ control 21 Dec 2003 20:07:37 -0000 1.143
@@ -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], 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)
+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
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
+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 | x-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
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: