[pkg-java] r4522 - trunk/glassfish/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-10-30 20:37:35 +0000 (Tue, 30 Oct 2007)
New Revision: 4522

Modified:
   trunk/glassfish/debian/glassfish-activation.install
   trunk/glassfish/debian/glassfish-appserv.install
   trunk/glassfish/debian/glassfish-javaee.install
   trunk/glassfish/debian/glassfish-jmac-api.install
   trunk/glassfish/debian/glassfish-mail.install
   trunk/glassfish/debian/glassfish-toplink-essentials.install
   trunk/glassfish/debian/rules
Log:
add prefix 'glassfish-' to all jars


Modified: trunk/glassfish/debian/glassfish-activation.install
===================================================================
--- trunk/glassfish/debian/glassfish-activation.install	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/glassfish-activation.install	2007-10-30 20:37:35 UTC (rev 4522)
@@ -1 +1 @@
-debian/tmp/usr/share/java/activation*
+debian/tmp/usr/share/java/glassfish-activation*

Modified: trunk/glassfish/debian/glassfish-appserv.install
===================================================================
--- trunk/glassfish/debian/glassfish-appserv.install	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/glassfish-appserv.install	2007-10-30 20:37:35 UTC (rev 4522)
@@ -1 +1 @@
-debian/tmp/usr/share/java/appserv*
+debian/tmp/usr/share/java/glassfish-appserv*

Modified: trunk/glassfish/debian/glassfish-javaee.install
===================================================================
--- trunk/glassfish/debian/glassfish-javaee.install	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/glassfish-javaee.install	2007-10-30 20:37:35 UTC (rev 4522)
@@ -1 +1 @@
-debian/tmp/usr/share/java/javaee*
+debian/tmp/usr/share/java/glassfish-javaee*

Modified: trunk/glassfish/debian/glassfish-jmac-api.install
===================================================================
--- trunk/glassfish/debian/glassfish-jmac-api.install	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/glassfish-jmac-api.install	2007-10-30 20:37:35 UTC (rev 4522)
@@ -1 +1 @@
-debian/tmp/usr/share/java/jmac-api*
+debian/tmp/usr/share/java/glassfish-jmac-api*

Modified: trunk/glassfish/debian/glassfish-mail.install
===================================================================
--- trunk/glassfish/debian/glassfish-mail.install	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/glassfish-mail.install	2007-10-30 20:37:35 UTC (rev 4522)
@@ -1 +1 @@
-debian/tmp/usr/share/java/mail*
+debian/tmp/usr/share/java/glassfish-mail*

Modified: trunk/glassfish/debian/glassfish-toplink-essentials.install
===================================================================
--- trunk/glassfish/debian/glassfish-toplink-essentials.install	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/glassfish-toplink-essentials.install	2007-10-30 20:37:35 UTC (rev 4522)
@@ -1 +1 @@
-debian/tmp/usr/share/java/toplink-essentials*
+debian/tmp/usr/share/java/glassfish-toplink-essentials*

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2007-10-30 19:53:40 UTC (rev 4521)
+++ trunk/glassfish/debian/rules	2007-10-30 20:37:35 UTC (rev 4522)
@@ -10,11 +10,14 @@
 DEB_JARS		:= servlet-api jsp-api
 DEB_DESTDIR		:= $(CURDIR)/debian/tmp
 
+ALL_JARS = $(wildcard publish/glassfish/lib/*.jar)
+DEST_DIR = $(DEB_DESTDIR)/usr/share/java
 common-install-prehook-indep::
-	for jar in `ls publish/glassfish/lib | grep jar$ `; \
-	do \
-		install -m 644 -D publish/glassfish/lib/$$jar $(DEB_DESTDIR)/usr/share/java/`basename $$jar .jar`-$(DEB_UPSTREAM_VERSION).jar; \
-		ln -s /usr/share/java/`basename $$jar .jar`-$(DEB_UPSTREAM_VERSION).jar $(DEB_DESTDIR)/usr/share/java/$$jar; \
+	for jar in $(ALL_JARS); do                         \
+	  BASENAME=glassfish-`basename $$jar .jar`;        \
+	  FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
+	  install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME;  \
+	  ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
 	done
 
 get-orig-source: