CVS:oo-deb/debian changelog,1.287,1.288 control,1.154,1.155 control.in,1.121,1.122 rules,1.192,1.193
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv12987
Modified Files:
changelog control control.in rules
Log Message:
* Document ooo-build patch changes
* Reword some changelog entries
* modify libmyspell, libaltlinuxhyph-dev and newer libart build
dependencies to not require them in Woody backport
* do not use system curl for Woody backport because the version is too
old
* Remove extra logic to generate Depends on debianutils (>2.0) for
non-Woody backport: OOo gives a reasonable error message if
sensible-browser is not available, and this would have forced us to
ship another package for the backport
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- rules 3 Apr 2004 16:27:45 -0000 1.192
+++ rules 6 Apr 2004 11:02:42 -0000 1.193
@@ -52,8 +52,6 @@
--with-system-zlib \
--with-system-nas \
--with-system-sane-headers \
- --with-system-curl \
- --with-system-altlinuxhyph \
--with-system-x11-extensions-headers \
--with-system-unixodbc-headers
@@ -107,6 +105,7 @@
# automatic configuration for woody backports
# check that default compiler is not gcc 2.x (as it is on Woody)
ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
+ ## Normal unstable/experimental packaging
ifeq ($(ARCH),sparc)
# Use 32 bit compiler
_CC:=sparc-linux-gcc
@@ -121,11 +120,12 @@
CONFIGURE_FLAGS+= --enable-fontconfig
CONFIGURE_FLAGS+= --with-system-myspell
USE_SYSTEM_DB=y
- CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D)
+ CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D) \
+ --with-system-altlinuxhyph --with-system-curl
#CONFIGURE_FLAGS+= --with-system-neon
PATCHSET=Debian
- DEBIANUTILSDEPENDS=, debianutils (>= 2.0)
else
+ ## Woody backport
# use latest gcc-3.x compiler version
_CC:=$(shell cd /usr/bin; ls gcc-3.* | tail -1)
CXX:=$(subst gcc,g++,$(_CC))
@@ -1091,7 +1091,6 @@
# causes ldd crashes sometimes when used with fakeroot:
# -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
- -V'debianutils-depends=$(DEBIANUTILSDEPENDS)' \
-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)'
# -v1.1.0+1.1.1rc3-`dpkg-parsechangelog | grep urgency \
# | awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- control.in 3 Apr 2004 16:27:45 -0000 1.121
+++ control.in 6 Apr 2004 11:02:42 -0000 1.122
@@ -3,13 +3,13 @@
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, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], 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, libxrender-dev | xlibs-d
ev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-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.8), 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, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], 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 | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-de
v | g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.0+1.1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts${debianutils-depends}
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.0+1.1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
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, msttcorefonts, openoffice.org-mimelnk
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), openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -49,7 +49,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the architecture-dependent binaries and libraries of
- OpenOffice.org.
+ OpenOffice.org. See the openoffice.org package for more information.
.
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- changelog 3 Apr 2004 16:30:56 -0000 1.287
+++ changelog 6 Apr 2004 11:02:42 -0000 1.288
@@ -3,20 +3,31 @@
* New patches:
- sysui-translations.diff: add .fi translations to sysui, thanks
Martin-Éric Racine (closes: #236796)
+ - build-use-old-libart.diff: Adapt from Red Hat patch to use older version
+ of libart for Woody backport [DW, CH]
+ * Modified patches:
+ - system-freetype.diff: Fix for Woody backport - use -lfreetype to link
+ internal freetype [CH]
* debian/control.in:
- - modify libdb builddeps to not require it on woody [RE]
+ - modify libdb, libmyspell, libaltlinuxhyph-dev and newer libart build
+ dependencies to not require them in Woody backport [RE,CH]
- Standards-Version: 3.6.1 (no changes needed)
- - s/gimp-perl | gimp1.2-perl/gimp/, we now use script-fu [RE]
+ - use gimp instead of gimp-perl, we now use script-fu [RE]
+ - do not use system curl for Woody backport because the version is too
+ old [CH]
* debian/rules:
- disable use of external libdb and libmyspell for woody builds,
it won't work because we have to use g++-3.0 on woody and libdb3_cxx is
C++ built with g++-2.95... thanks Severin Greimel for the pointer [RE]
- - make debian/rules makebinariestar working on !i386 [RE]
+ - fix debian/rules makebinariestar target for !i386 [RE]
* debian/scripts/xcftobmp:
- - make it use script-fu since gimp-perl is removed from sid, thanks
- Martin Kretzschmar [RE]
+ - use script-fu since gimp-perl is removed from sid [MK, RE]
+ * Remove extra logic to generate Depends on debianutils (>2.0) for
+ non-Woody backport: OOo gives a reasonable error message if
+ sensible-browser is not available, and this would have forced us to
+ ship another package for the backport [CH]
- -- Rene Engelhard <rene@debian.org> Fri, 2 Apr 2004 21:48:09 +0200
+ -- Chris Halls <halls@debian.org> Tue, 6 Apr 2004 12:11:35 +0200
openoffice.org (1.1.1-1) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- control 3 Apr 2004 16:27:45 -0000 1.154
+++ control 6 Apr 2004 11:02:42 -0000 1.155
@@ -3,13 +3,13 @@
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, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], 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, libxrender-dev | xlibs-d
ev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-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.8), 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, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], 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 | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-de
v | g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.0+1.1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts${debianutils-depends}
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin (>> 1.1.0+1.1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
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, msttcorefonts, openoffice.org-mimelnk
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), openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -49,7 +49,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the architecture-dependent binaries and libraries of
- OpenOffice.org.
+ OpenOffice.org. See the openoffice.org package for more information.
.
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
Reply to: