[glassfish] 10/40: add prefix 'glassfish-' to all jars

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1
in repository glassfish.

commit a75c6b854fb1e940f921deaccffbf20542c39e60
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Oct 30 20:37:35 2007 +0000

    add prefix 'glassfish-' to all jars
---
 debian/glassfish-activation.install         |  2 +-
 debian/glassfish-appserv.install            |  2 +-
 debian/glassfish-javaee.install             |  2 +-
 debian/glassfish-jmac-api.install           |  2 +-
 debian/glassfish-mail.install               |  2 +-
 debian/glassfish-toplink-essentials.install |  2 +-
 debian/rules                                | 11 +++++++----
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/glassfish-activation.install b/debian/glassfish-activation.install
index 4dcd61d..263e494 100644
--- a/debian/glassfish-activation.install
+++ b/debian/glassfish-activation.install
@@ -1 +1 @@
-debian/tmp/usr/share/java/activation*
+debian/tmp/usr/share/java/glassfish-activation*
diff --git a/debian/glassfish-appserv.install b/debian/glassfish-appserv.install
index 1f86e2b..b4cd232 100644
--- a/debian/glassfish-appserv.install
+++ b/debian/glassfish-appserv.install
@@ -1 +1 @@
-debian/tmp/usr/share/java/appserv*
+debian/tmp/usr/share/java/glassfish-appserv*
diff --git a/debian/glassfish-javaee.install b/debian/glassfish-javaee.install
index d8cf31e..469e307 100644
--- a/debian/glassfish-javaee.install
+++ b/debian/glassfish-javaee.install
@@ -1 +1 @@
-debian/tmp/usr/share/java/javaee*
+debian/tmp/usr/share/java/glassfish-javaee*
diff --git a/debian/glassfish-jmac-api.install b/debian/glassfish-jmac-api.install
index 7751b79..a2d2337 100644
--- a/debian/glassfish-jmac-api.install
+++ b/debian/glassfish-jmac-api.install
@@ -1 +1 @@
-debian/tmp/usr/share/java/jmac-api*
+debian/tmp/usr/share/java/glassfish-jmac-api*
diff --git a/debian/glassfish-mail.install b/debian/glassfish-mail.install
index bb8205c..24c08cb 100644
--- a/debian/glassfish-mail.install
+++ b/debian/glassfish-mail.install
@@ -1 +1 @@
-debian/tmp/usr/share/java/mail*
+debian/tmp/usr/share/java/glassfish-mail*
diff --git a/debian/glassfish-toplink-essentials.install b/debian/glassfish-toplink-essentials.install
index 1115ba0..1a121aa 100644
--- a/debian/glassfish-toplink-essentials.install
+++ b/debian/glassfish-toplink-essentials.install
@@ -1 +1 @@
-debian/tmp/usr/share/java/toplink-essentials*
+debian/tmp/usr/share/java/glassfish-toplink-essentials*
diff --git a/debian/rules b/debian/rules
index 79db799..70ce87e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,14 @@ DEB_ANT_BUILDFILE	:= debian/build.xml
 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:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git