forcemerge 478623 467107 tags 467107 + patch thanks Patch attached, merging with #478623.
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -urNad sablevm-classlib-1.13.orig/debian/rules
sablevm-classlib-1.13/debian/rules
--- sablevm-classlib-1.13.orig/debian/rules 2008-05-04 00:34:06.000000000
+0100
+++ sablevm-classlib-1.13/debian/rules 2008-05-04 00:35:05.000000000 +0100
@@ -80,7 +80,7 @@
# these docs are already in "classpath" debian package
-rm -rf $(CURDIR)/debian/libsablevm-classlib1-java/usr/info
-rm -rf $(CURDIR)/debian/libsablevm-classlib1-java/usr/share/info
- -mkdir -p $(CURDIR)/debian/libsablevm-classlib1-java/usr/share/sablevm
&>/dev/null
+ -mkdir -p $(CURDIR)/debian/libsablevm-classlib1-java/usr/share/sablevm
>/dev/null 2>&1
echo -n "/usr/share/sablevm-classpath/libclasspath.jar" > \
$(CURDIR)/debian/libsablevm-classlib1-java/usr/share/sablevm/classlib.pth
# copy security files
diff -urNad sablevm-classlib-1.13.orig/lib/Makefile.am
sablevm-classlib-1.13/lib/Makefile.am
--- sablevm-classlib-1.13.orig/lib/Makefile.am 2008-05-04 00:34:06.000000000
+0100
+++ sablevm-classlib-1.13/lib/Makefile.am 2008-05-04 00:34:41.000000000
+0100
@@ -53,10 +53,11 @@
JAVA_HOME=$(DESTDIR)$(libdir)/sablevm
install-data-hook:
- mkdir -p $(JAVA_HOME)/{lib,jre/lib}
+ mkdir -p $(JAVA_HOME)/lib $(JAVA_HOME)/jre/lib
-unlink $(JAVA_HOME)/jre/lib/rt.jar
for f in $(pkgdata_DATA) ; do \
- rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \
+ rm -f $(JAVA_HOME)/lib/$$f ; \
+ rm -f $(JAVA_HOME)/jre/lib/$$f ; \
$(LN_S) ../../../share/sablevm-classpath/$$f $(JAVA_HOME)/lib/$$f ; \
$(LN_S) ../../lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \
done
@@ -64,7 +65,8 @@
uninstall-hook:
for f in $(pkgdata_DATA) ; do \
- rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \
+ rm -f $(JAVA_HOME)/lib/$$f ; \
+ rm -f $(JAVA_HOME)/jre/lib/$$f ; \
done
-unlink $(JAVA_HOME)/jre/lib/rt.jar
-(cd $(JAVA_HOME) && rmdir -p lib jre/lib)
signature.asc
Description: PGP signature
