./packages/openofficeorg/3.0/experimental r1109: move URE back to /usr/lib/ure
------------------------------------------------------------
revno: 1109
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-06-07 12:40:11 +0200
message:
move URE back to /usr/lib/ure
modified:
changelog
rules
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2008-06-06 11:05:32 +0000
+++ b/changelog 2008-06-07 10:40:11 +0000
@@ -24,8 +24,7 @@
Remove obsolete mvs
- support default-jdk-builddep, begin support of openjdk-6-jdk for
building, still default to java-gcj-compat-dev
- - move ure Java stuff to /usr/share/java and the URE itself to
- /usr/lib/openoffice/ure (easier to maintain with the three-layer OOo)
+ - move ure Java stuff to /usr/share/java (as before in -java-common)
- temporarily disable SDK package (until jsc21) and mozilla plugin
(until sb87)
- update get-orig-source target for fixed hyph_en_US.dic
@@ -55,7 +54,7 @@
* debian/copyright: LGPL v3; update
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 22:27:01 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 06 Jun 2008 14:34:39 +0200
openoffice.org (1:2.4.1~rc2-1.2pre) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-06-06 11:05:32 +0000
+++ b/rules 2008-06-07 10:40:11 +0000
@@ -20,7 +20,7 @@
OODIRNAME=openoffice$(VER)
OOBASISDIR:=usr/lib/$(OODIRNAME)/basis$(OOVER)
OOBRANDDIR:=usr/lib/openoffice
-OOUREDIR:=usr/lib/openoffice/ure
+OOUREDIR:=usr/lib/ure
OOSDKDIR:=usr/lib/openoffice/sdk
# compatability
OODIR:=$(OOBASISDIR)
@@ -1648,6 +1648,11 @@
debian/tmp/pkg/openoffice.org-dev-doc/$(OODIR)/sdk
endif
+ # fixup ure-link symlink. The move is done in install-arch
+ # but the link is in -common so we need to do it here.
+ cd debian/tmp/pkg/openoffice.org-common/$(OOBASISDIR) && \
+ ln -sf /$(OOUREDIR) ure-link
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@ -1836,6 +1841,9 @@
rm -rf debian/ure debian/ure.*.debhelper ;\
cp -r --preserve=mode debian/tmp/pkg/ure debian/ure || exit 1
+ # move the URE to /usr/lib/ure
+ mv debian/ure/$(OOBRANDDIR)/ure debian/ure/usr/lib
+ rmdir debian/ure/$(OOBRANDDIR)
# move URE Java stuff to /usr/share/java
mkdir -p debian/ure/usr/share/java/$(OODIRNAME)
mv debian/ure/$(OOUREDIR)/lib/JREProperties.class \
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2008-03-28 09:57:54 +0000
+++ b/shell-lib.sh 2008-06-07 10:40:11 +0000
@@ -62,7 +62,7 @@
INSTDIR=`mktemp -d`
/usr/lib/openoffice/program/unopkg remove --shared $1 \
"-env:UserInstallation=file://$INSTDIR" \
- '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/share/config/javasettingsunopkginstall.xml' \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
@@ -75,7 +75,7 @@
INSTDIR=`mktemp -d`
/usr/lib/openoffice/program/unopkg add --shared $1 \
"-env:UserInstallation=file:///$INSTDIR" \
- '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/share/config/javasettingsunopkginstall.xml' \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
Reply to: