------------------------------------------------------------
revno: 2354
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Thu 2011-01-27 20:22:56 +0100
message:
install jar.sos in /usr/lib/gcj/libreoffice instead of /openoffice
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2011-01-26 02:35:28 +0000
+++ b/changelog 2011-01-27 19:22:56 +0000
@@ -6,8 +6,10 @@
* debian/rules:
- fix parallel=n handling to also work if parallel=N is not the first or
only option, thanks Kees Cook
+ - install jar.sos in /usr/lib/gcj/libreoffice instead of /openoffice
+ (closes: #611276)
- -- Rene Engelhard <[email protected]> Tue, 25 Jan 2011 12:42:33 +0100
+ -- Rene Engelhard <[email protected]> Thu, 27 Jan 2011 19:20:13 +0000
libreoffice (1:3.3.0-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2011-01-26 02:20:19 +0000
+++ b/rules 2011-01-27 19:22:56 +0000
@@ -2170,7 +2170,7 @@
cd debian/scripts && \
patch -p0 < $(CURDIR)/debian/aotcompile-256M-default.diff
PYTHONPATH="debian/scripts:$(shell echo $(PYTHON_SITE) | sed -e
s,debian/python-uno,,)" \
- AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \
+ AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/$(OODIRNAME) \
debian/tmp/native-jars debian/tmp/native-jars/gcj
gcj-dbtool -n debian/tmp/native-jars/tmp.db 64
find debian/tmp/native-jars/gcj -name '*.db' -print0 \
@@ -2613,8 +2613,8 @@
ifeq "$(BUILD_JARS_NATIVE)" "y"
ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
rm -rf $(PKGDIR)-gcj/usr/lib/gcj
- mkdir -p $(PKGDIR)-gcj/usr/lib/gcj/openoffice
- cp -p debian/tmp/native-jars/gcj/* $(PKGDIR)-gcj/usr/lib/gcj/openoffice
+ mkdir -p $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
+ cp -p debian/tmp/native-jars/gcj/*
$(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
mkdir -p $(PKGDIR)-gcj/usr/share/gcj/classmap.d
cp -p debian/tmp/native-jars/tmp.db \
$(PKGDIR)-gcj/usr/share/gcj/classmap.d/libreoffice.db
