[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.2.1/unstable r2073: change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded as otherwise libjpipe.so is not found...



------------------------------------------------------------
revno: 2073
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-08-24 13:38:08 +0200
message:
  change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded as otherwise libjpipe.so is not found...
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2010-08-23 21:27:56 +0000
+++ b/changelog	2010-08-24 11:38:08 +0000
@@ -2,6 +2,9 @@
 
   * debian/control.in:
     - we use bc in debian/rules, we probably should build-dep on it
+  * debian/rules:
+    - change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded
+      as otherwise libjpipe.so is not found...
 
  -- Rene Engelhard <rene@debian.org>  Mon, 23 Aug 2010 23:25:52 +0200
 

=== modified file 'rules'
--- a/rules	2010-08-17 16:34:51 +0000
+++ b/rules	2010-08-24 11:38:08 +0000
@@ -2483,6 +2483,17 @@
 		for i in $(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/*.jar; do \
 			ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'` `basename $$i`; \
 		done
+	# fix up Class-Path of jurt.jar to be able to find libjpipe.so.
+	# See http://www.openoffice.org/servlets/ReadMsg?list=dev&msgNo=27765
+	t=`mktemp -q -d`; \
+	mkdir -p $$t && cd $$t && \
+	unzip $(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/jurt.jar \
+		META-INF/MANIFEST.MF && \
+	perl -pi -e 's#../../lib/#../../lib/ /$(OOUREDIR)/lib/#g' \
+		META-INF/MANIFEST.MF && \
+	zip -r $(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/jurt.jar \
+		META-INF/MANIFEST.MF && \
+	cd $(CURDIR) && rm -rf $$t
 endif
 	# and the public libs to uno-libs3
 	mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
@@ -3488,7 +3499,7 @@
 	# three-layer symlinks also for /usr/share
 	ln -s basis$(OOVER) \
 		$(PKGDIR)-common/$(shell echo $(OOBRANDDIR) | sed -e s/lib/share/)/basis-link
-	ln -s /usr/lib/ure \
+	ln -s /$(OOUREDIR) \
 		$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/ure-link
 
 ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"


Reply to: