[pkg-java] r4874 - in trunk/libjdic-java/debian: . patches

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-11-28 11:45:51 +0000 (Wed, 28 Nov 2007)
New Revision: 4874

Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/patches/demos_README.diff
   trunk/libjdic-java/debian/rules
Log:
  + Do not create symlinks and use java.library.path

Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2007-11-28 08:59:29 UTC (rev 4873)
+++ trunk/libjdic-java/debian/changelog	2007-11-28 11:45:51 UTC (rev 4874)
@@ -4,7 +4,7 @@
     + Don't use ant.mk
     + Separate out build-indep and build-arch for libjdic-java and
     libjdic-bin packages.
-    + Fix broken symbolic links
+    + Do not create symlinks and use java.library.path
   * Fix paths in docs, libjdic-bin.install files.
   * debian/control:
     + Move sun-java5-jdk, libnetx-java to Build-Depends-Indep

Modified: trunk/libjdic-java/debian/patches/demos_README.diff
===================================================================
--- trunk/libjdic-java/debian/patches/demos_README.diff	2007-11-28 08:59:29 UTC (rev 4873)
+++ trunk/libjdic-java/debian/patches/demos_README.diff	2007-11-28 11:45:51 UTC (rev 4874)
@@ -1,7 +1,7 @@
-Index: libjdic-java-20060613/jdic/demo/README
+Index: libjdic-java-0.0.20060613/jdic/demo/README
 ===================================================================
---- libjdic-java-20060613.orig/jdic/demo/README	2007-08-26 18:06:48.000000000 +0530
-+++ libjdic-java-20060613/jdic/demo/README	2007-08-26 18:08:45.000000000 +0530
+--- libjdic-java-0.0.20060613.orig/jdic/demo/README	2004-09-30 18:09:50.000000000 +0530
++++ libjdic-java-0.0.20060613/jdic/demo/README	2007-11-28 17:21:30.000000000 +0530
 @@ -4,13 +4,7 @@
  Run the demos using the following instructions (assuming java command 
  is under your PATH):
@@ -13,7 +13,13 @@
 -Unix
 -
 -  java -classpath ../../jdic.jar:. -Djava.library.path=../../ <class name>
-+  java -classpath /usr/share/java/jdic.jar: <class name>
++  java -classpath /usr/share/java/jdic.jar: -Djava.library.path=/usr/lib/libjdic-java/ <class name>
  
  where <class name> is the same as the application's name, such as FileExplorer,
  FileChooser, FileTypes, SimpleBrowser, Browser, and Tray. 
+@@ -103,3 +97,5 @@
+   
+   For Windows platforms, the tray icon is created in the System Tray Area. 
+   For Unix platforms, it's created in the Notification Area.
++
++ -- Varun Hiremath <varunhiremath at gmail.com>, Wed, 28 Nov 2007 17:21:30 +0530

Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2007-11-28 08:59:29 UTC (rev 4873)
+++ trunk/libjdic-java/debian/rules	2007-11-28 11:45:51 UTC (rev 4874)
@@ -21,11 +21,7 @@
 	ant -f jdic/build.xml buildunixjni buildunixembed
 	touch $@
 
-ALL_OBJS = libjdic.so libmozembed-linux-gtk2.so libtray.so mozembed-linux-gtk2
-
 install/libjdic-java:: debian/stamp-binary-indep
-	for i in $(ALL_OBJS); do \
-		dh_link /usr/lib/libjdic-java/$$i /usr/share/java/$$i; done
 	install -D -m 644 jdic/dist/*/jdic.jar debian/libjdic-java/usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jdic.jar