CVS:oo-deb/debian changelog,1.211,1.212 openoffice.org.install,1.30,1.31 rules,1.145,1.146
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv30048
Modified Files:
changelog openoffice.org.install rules
Log Message:
- mention use of oo-xfvb-run and -a
- system-zlib and print-fontconfig are made conditional,
add --with-system-zlib and --enable-fontconfig (latter only on sarge/sid)
to ./configure call
- remove opens___.ttf install line from openoffice.org.install and
install it into the right location in debian/rules depending on whether
we use fontconfig or not
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- changelog 12 Oct 2003 19:20:07 -0000 1.211
+++ changelog 16 Oct 2003 12:53:13 -0000 1.212
@@ -5,7 +5,7 @@
* Build without a JDK. (closes: #211288) [JT]
* Added patches:
- - system-zlib: use system zlib (from Mandrake) [RE]
+ - system-zlib: use system zlib (based on Mandrake's) [RE]
- system-getopt: use the getopt from system's glibc
(from Mandrake) [RE]
- allow-no-jdk.diff [JT]: If java is disabled with --disable-java,
@@ -31,7 +31,7 @@
with SOLAR_JAVA not set.
- javaunohelper-handle-no-solar-java.diff [JT]: Don't build
javaunohelper with SOLAR_JAVA not set
- - psprint-handle-no-solar-java.diff [JT]: Don't use jvmaccess
+ - psprint-handle-no-solar-java.diff [JT, RE]: Don't use jvmaccess
to get JDK font path with SOLAR_JAVA not set.
- sj2-handle-no-solar-java.diff [JT]: When SOLAR_JAVA is not set,
replace java applet support with stubs that throw an exception.
@@ -92,7 +92,11 @@
debian/patches directory [JT]
- install ooo-build changelog as changelog.ooo-build.gz instead
of changelog.Ximian+Debian.gz [RE]
- - use -a for xvfb-run [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]
* debian/scripts/detect_java.sh:
- removed [JT]
* debian/setperms:
@@ -109,7 +113,7 @@
- remove Recommends: openoffice.org from -crashrep since it depends:
on openoffice.org anyway ;) [RE]
* Use Ximian icons version 1.1-4 [CH]
- * Removed obsolete dbs packaging scripts [JT]:
+ * Removed obsolete dbs packaging scripts [JT, RE]:
- debian/doogie-build-system
- debian/scripts/fix.source.patch
- debian/scripts/getglibcversion
@@ -119,8 +123,9 @@
- debian/scripts/source.patch
- debian/scripts/source.unpack
- debian/scripts/unfix.source.patch
+ - debian/scripts/messages
- -- Rene Engelhard <rene@debian.org> Sun, 12 Oct 2003 20:31:37 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 16 Oct 2003 10:27:48 +0200
openoffice.org (1.1.0-1) unstable; urgency=low
Index: openoffice.org.install
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org.install,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- openoffice.org.install 8 Oct 2003 14:20:19 -0000 1.30
+++ openoffice.org.install 16 Oct 2003 12:53:13 -0000 1.31
@@ -202,7 +202,6 @@
usr/lib/openoffice/share/dtd/officedocument/1_0/table.mod
usr/lib/openoffice/share/dtd/officedocument/1_0/text.mod
usr/lib/openoffice/share/dtd/officedocument/1_0/toolbar.dtd
-usr/lib/openoffice/share/fonts/truetype/opens___.ttf usr/share/fonts/truetype/openoffice
usr/lib/openoffice/share/gallery/apples.gif
usr/lib/openoffice/share/gallery/bigapple.gif
usr/lib/openoffice/share/gallery/bullets/blkpearl.gif
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- rules 13 Oct 2003 09:28:12 -0000 1.145
+++ rules 16 Oct 2003 12:53:14 -0000 1.146
@@ -81,6 +81,8 @@
#USE_SYSTEM_LIBS=y
USE_SYSTEM_LIBS=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
+ USE_FONTCONFIG=y
+ CONFIGURE_FLAGS+= --enable-fontconfig
else
# use latest gcc-3.x compiler version
_CC=$(shell cd /usr/bin; ls gcc-3.* | tail -1)
@@ -519,8 +521,8 @@
test -r /usr/share/java/xalan2.jar
endif
- # test for libhpi.so and warn ppc folks....
ifeq "$(ARCH)" "powerpc"
+ # test for libhpi.so and warn ppc folks....
find /$(JDK_HOME) -type f -name "libhpi*" | grep usr | grep green \
> debian/libhpi.search && if [ -s debian/libhpi.search ]; then \
echo ""; echo ""; \
@@ -543,13 +545,14 @@
cd $(SOURCE_TREE)/config_office && autoconf && \
CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
- --with-lang=ALL \
+ --with-lang=ALL \
--enable-libart \
--disable-rpath \
--enable-crashdump \
--enable-symbols=SMALL \
--without-fonts \
- $(CONFIGURE_FLAGS) \
+ --with-system-zlib \
+ $(CONFIGURE_FLAGS) \
< /dev/null
touch $@
@@ -883,6 +886,17 @@
# install info file for update-openoffice-dicts
install -m644 debian/dictlistinfo \
$(MAINPKGDIR)/usr/share/myspell/infos/ooo/openoffice.org$(VER)
+
+ifeq "$(USE_FONTCONFIG)" "y"
+ mkdir -p $(MAINPKGDIR)/usr/share/fonts/truetype/openoffice
+ install -m644 $(PKGOPENOFFICEDIR)/share/fonts/truetype/opens___.ttf \
+ $(MAINPKGDIR)/usr/share/fonts/truetype/openoffice
+else
+ mkdir -p $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype
+ for i in fonts.dir fonts.dir.global opens___.ttf; do \
+ install -m644 $(PKGOPENOFFICEDIR)/share/fonts/truetype/$$i \
+ $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype
+endif
touch $@
Reply to: