Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24244
Modified Files:
changelog control control.in rules
Log Message:
- mention dmake check
- add dmake [i386, powerpc, s390] to Build-Depends, change
autoconf-Build-Dependency to
autoconf (>= 2.54) [sparc] | autoconf [i386, powerpc, s390]
- rename USE_SYSTEM_LIBS to USE_SYSTEM_STLPORT
- use system dmake for cleaning if it exists
- s/645/$(BUILDNUM)/g
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- changelog 19 Oct 2003 13:03:19 -0000 1.213
+++ changelog 22 Oct 2003 13:35:50 -0000 1.214
@@ -99,18 +99,26 @@
conditionally in debian/rules [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]
* debian/scripts/detect_java.sh:
- removed [JT]
* debian/setperms:
- remove chmod of scripts/detect_java.sh [JT]
- remove chmod of obsolete dbs packaging scripts [JT]
* debian/control*:
- - add zlib1g-dev to Build-Depends: [RE]
+ - Build-Depends:
+ - 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 libstartup-notification0-dev [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]
- - Remove Build-Depends for j2sdk1.3 and lib*-java [JT]
- - Build-Depend on xsltproc [JT]
- Move from contrib to main [JT]
- remove Recommends: openoffice.org from -crashrep since it depends:
on openoffice.org anyway ;) [RE]
@@ -127,7 +135,7 @@
- debian/scripts/unfix.source.patch
- debian/scripts/messages
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 16 Oct 2003 10:27:48 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 22 Oct 2003 00:01:18 +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.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- control.in 12 Oct 2003 19:20:07 -0000 1.95
+++ control.in 22 Oct 2003 13:35:51 -0000 1.96
@@ -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), 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
+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]
Standards-Version: 3.5.6
Package: openoffice.org
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- control 12 Oct 2003 19:25:50 -0000 1.127
+++ control 22 Oct 2003 13:35:51 -0000 1.128
@@ -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), 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
+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]
Standards-Version: 3.5.6
Package: openoffice.org
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- rules 19 Oct 2003 13:03:19 -0000 1.148
+++ rules 22 Oct 2003 13:35:51 -0000 1.149
@@ -78,8 +78,8 @@
ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
_CC=gcc
CXX=g++
- #USE_SYSTEM_LIBS=y
- USE_SYSTEM_LIBS=n
+ #USE_SYSTEM_STLPORT=y
+ USE_SYSTEM_STLPORT=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
USE_FONTCONFIG=y
CONFIGURE_FLAGS+= --enable-fontconfig
@@ -89,7 +89,7 @@
CXX=$(subst gcc,g++,$(_CC))
# Don't use system libstlport
- USE_SYSTEM_LIBS=n
+ USE_SYSTEM_STLPORT=n
endif
# gcc version can be overriden by setting GCCVER in scripts/vars[.arch]
@@ -279,23 +279,26 @@
# we do not need them and they make problem with dpkg-source....
rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/www/*.png
- # Clean rule, if we had a system dmake..
- #if [ -f $(SOURCE_TREE)/$(ENVFILE) ]; then \
- # cd $(SOURCE_TREE) && . ./$(ENVFILE) && \
- # dmake distclean; \
- #fi
- cd $(SOURCE_TREE)/config_office && \
- rm -f config.cache config.log \
- config.status config.parms \
- warn set_soenv && \
- rm -rf autom4te.cache
+ 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
+ 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
# remove xcf and bmp from the Debian splashscreen
rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \
@@ -449,7 +452,7 @@
#rm -rf $(SOURCE_TREE)/external/gpc
-ifeq "$(USE_SYSTEM_LIBS)" "y"
+ifeq "$(USE_SYSTEM_STLPORT)" "y"
# making stlport home
if [ ! -d stlport-home ]; then \
mkdir stlport-home ;\
@@ -468,9 +471,11 @@
# 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
touch $@
@@ -773,15 +778,16 @@
endif
for i in javaldx javaloader.uno.so javavm.uno.so jvmsetup.bin \
libdb_java-3.2.so libjava_uno.so libjdbc2.so libjpipe.so \
- libjuh.so libjuhx.so libjvm645$(LIBSUFFIX).so \
+ libjuh.so libjuhx.so libjvm$(BUILDNUM)$(LIBSUFFIX).so \
libjvmaccessgcc3.so.3.1.0 libofficebean.so \
- libxmlfa645$(LIBSUFFIX).so libxmlfd645$(LIBSUFFIX).so; do \
+ libxmlfa$(BUILDNUM)$(LIBSUFFIX).so \
+ libxmlfd$(BUILDNUM)$(LIBSUFFIX).so; do \
cp -rf $(PKGOPENOFFICEDIR)/program/$$i \
$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program; \
done
endif
-ifneq "$(USE_SYSTEM_LIBS)" "y"
+ifneq "$(USE_SYSTEM_STLPORT)" "y"
# Copy libstlport if we are using the internal library
cp -f $(PKGOPENOFFICEDIR)/program/libstlport_gcc.so \
$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
@@ -976,7 +982,7 @@
dh_fixperms
dh_installdeb
dh_shlibdeps -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program \
- $(SHLIBS_OVERRIDE)
+ $(SHLIBS_OVERRIDE) -Xsvx
dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))'
dh_md5sums
dh_builddeb
