Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv23647
Modified Files:
changelog control control.in rules
Log Message:
- now use system dmake on all archs
- unconditionalize dmake build-dependency
- unconditionalize autoconf build-dependency and make it only autoconf
- minor changelog restructuring
- delete detection whether we have /usr/bin/dmake from rules since we
now have it everywhere
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- changelog 22 Oct 2003 15:04:15 -0000 1.215
+++ changelog 22 Oct 2003 16:06:12 -0000 1.216
@@ -50,6 +50,10 @@
- desktop-handle-no-solar-java.diff [JT]: Don't build javaldx
with SOLAR_JAVA not set, and check for javaldx in soffice.sh
before using it.
+ * Modified patches:
+ - print-fontconfig / padmin-nofontconfig: make conditional
+ - config.switches.diff: add --enable-fontconfig, --with-system-zlib;
+ check whether we have a system dmake and don't build dmake if we have
* debian/MANIFEST.*:
- remove java files [JT]
* debian/openoffice.org.install:
@@ -94,13 +98,12 @@
of changelog.Ximian+Debian.gz [RE]
- use oo-xvfb-run instead of xvfb-run for woody compatibility and
call it with -a... [RE]
- - fontconfig-patches are made conditional; --enable-fontconfig when
- building on sarge/sid. Install OpenSymbol font into the right place
- conditionally in debian/rules [RE]
+ - --enable-fontconfig when building on sarge/sid.
+ Install OpenSymbol font into the right place conditionally [RE]
+ - --with-system-zlib [RE]
- when we are building on an user "buildd" (as used on the buildds)
enable deloutput automatically [RE]
- - check whether a system dmake is available - do not build dmake
- then.. [RE]
+ - use system dmake [RE]
* debian/scripts/detect_java.sh:
- removed [JT]
* debian/setperms:
@@ -111,10 +114,8 @@
- add zlib1g-dev [RE]
- remove j2sdk1.3 and lib*-java [JT]
- add xsltproc [JT]
- - add dmake (currently only for i386, powerpc and s390 since the pkg for
- sparc isn't available yet) [RE]
- - half-lower autoconf build-dependency; only Build-Depend: on
- autoconf (>= 2.54) on archs where we have to build dmake [RE]
+ - add dmake [RE]
+ - lower autoconf builddep to just autoconf [RE]
- Bump virtual l10n package to 1.1.0.final; openoffice.org conflicts
with l10n-1.1.0 to force versions without the Ximian icons off the
system. (closes: #214703: all icons have magenta background) [CH]
@@ -134,7 +135,7 @@
- debian/scripts/unfix.source.patch
- debian/scripts/messages
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 22 Oct 2003 00:01:18 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 22 Oct 2003 17:58:31 +0200
openoffice.org (1.1.0-1) unstable; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- control.in 22 Oct 2003 13:35:51 -0000 1.96
+++ control.in 22 Oct 2003 16:06:12 -0000 1.97
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-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 (>= 2.54) [sparc] | autoconf [i386, powerpc, s390],
sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev,
libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc,
imagemagick, xutils, libfontconfig1-dev, 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 [i386, powerpc, s390]
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-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, imagemagick, xutils, libfontconfig1-dev, 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
Standards-Version: 3.5.6
Package: openoffice.org
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- control 22 Oct 2003 13:35:51 -0000 1.128
+++ control 22 Oct 2003 16:06:12 -0000 1.129
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-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 (>= 2.54) [sparc] | autoconf [i386, powerpc, s390],
sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev,
libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc,
imagemagick, xutils, libfontconfig1-dev, 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 [i386, powerpc, s390]
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-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, imagemagick, xutils, libfontconfig1-dev, 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
Standards-Version: 3.5.6
Package: openoffice.org
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- rules 22 Oct 2003 13:36:34 -0000 1.150
+++ rules 22 Oct 2003 16:06:12 -0000 1.151
@@ -279,26 +279,10 @@
# we do not need them and they make problem with dpkg-source....
rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/www/*.png
- if [ -x /usr/bin/dmake ]; then \
- # Clean rule if we have a system dmake..
- if [ -f $(SOURCE_TREE)/$(ENVFILE) ]; then \
- cd $(SOURCE_TREE) && . ./$(ENVFILE) && \
- dmake distclean; \
- fi; \
- else
- cd $(SOURCE_TREE)/config_office && \
- rm -f config.cache config.log \
- config.status config.parms \
- warn set_soenv && \
- rm -rf autom4te.cache
-
- rm -rf $(SOURCE_TREE)/*/$(ARCHBUILDDIR) \
- $(SOURCE_TREE)/solver \
- $(SOURCE_TREE)/dmake/autom4te.cache
- # workaround
- rm -f \
- $(SOURCE_TREE)/solenv/`echo $(ARCHBUILDDIR) | cut -d"."
-f1`/bin/dmake; \
- endif
+ if [ -f $(SOURCE_TREE)/$(ENVFILE) ]; then \
+ cd $(SOURCE_TREE) && . ./$(ENVFILE) && \
+ dmake distclean; \
+ fi
# remove xcf and bmp from the Debian splashscreen
rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \
