[pkg-java] r14852 - trunk/asm3/debian

[Torsten Werner]

Author: twerner
Date: 2011-09-12 11:31:15 +0000 (Mon, 12 Sep 2011)
New Revision: 14852

Modified:
   trunk/asm3/debian/changelog
   trunk/asm3/debian/libasm3-java.poms
   trunk/asm3/debian/rules
Log:
UNRELEASED
* Install asm-debug-all.jar.
* Do no longer install symlinks from asm3-all.jar to the individual jars.
  Install the real files instead.

Modified: trunk/asm3/debian/changelog
===================================================================
--- trunk/asm3/debian/changelog	2011-09-12 11:14:29 UTC (rev 14851)
+++ trunk/asm3/debian/changelog	2011-09-12 11:31:15 UTC (rev 14852)
@@ -1,9 +1,13 @@
 asm3 (3.3.1-2) unstable; urgency=low
 
+  UNRELEASED
   * Team upload.
   * Update POM files to version 3.3.1 and add missing files.
+  * Install asm-debug-all.jar.
+  * Do no longer install symlinks from asm3-all.jar to the individual jars.
+    Install the real files instead.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 12 Sep 2011 13:06:05 +0200
+ -- Torsten Werner <twerner at debian.org>  Mon, 12 Sep 2011 13:28:10 +0200
 
 asm3 (3.3.1-1) unstable; urgency=low
 

Modified: trunk/asm3/debian/libasm3-java.poms
===================================================================
--- trunk/asm3/debian/libasm3-java.poms	2011-09-12 11:14:29 UTC (rev 14851)
+++ trunk/asm3/debian/libasm3-java.poms	2011-09-12 11:31:15 UTC (rev 14852)
@@ -5,4 +5,6 @@
 debian/poms/asm-util.pom
 debian/poms/asm-xml.pom
 debian/poms/asm.pom
+debian/poms/asm-debug-all.pom
+debian/poms/asm-all.pom
 

Modified: trunk/asm3/debian/rules
===================================================================
--- trunk/asm3/debian/rules	2011-09-12 11:14:29 UTC (rev 14851)
+++ trunk/asm3/debian/rules	2011-09-12 11:31:15 UTC (rev 14852)
@@ -21,24 +21,17 @@
 		-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
 binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3 debian/poms/asm.pom output/dist/lib/asm-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-analysis debian/poms/asm-analysis.pom output/dist/lib/asm-analysis-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-commons debian/poms/asm-commons.pom output/dist/lib/asm-commons-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-tree debian/poms/asm-tree.pom output/dist/lib/asm-tree-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-util debian/poms/asm-util.pom output/dist/lib/asm-util-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-xml debian/poms/asm-xml.pom output/dist/lib/asm-xml-$(VERSION).jar
-	# make symlinks to the "all" jar
-	for FILE in debian/lib$(PACKAGE)-java/usr/share/java/*.jar ; do \
-		if [ ! -L "$$FILE" ] ; then \
-			rm -f "$$FILE" ; \
-			ln -s asm3-all-$(VERSION).jar "$$FILE" ; \
-		fi ; \
-	done
-	# Rename so the versionless link does not cause confusion/conflicts with earlier versions.
-	mv output/dist/lib/all/asm-all-$(VERSION).jar output/dist/lib/all/asm3-all-$(VERSION).jar
-	jar umf debian/osgi.MF output/dist/lib/all/asm3-all-$(VERSION).jar
-	jh_installlibs output/dist/lib/all/asm3-all-$(VERSION).jar
+	mh_installpoms -plib$(PACKAGE)-java -e$(VERSION)
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3 -e$(VERSION) debian/poms/asm.pom output/dist/lib/asm-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-analysis -e$(VERSION) debian/poms/asm-analysis.pom output/dist/lib/asm-analysis-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-commons -e$(VERSION) debian/poms/asm-commons.pom output/dist/lib/asm-commons-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-tree -e$(VERSION) debian/poms/asm-tree.pom output/dist/lib/asm-tree-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-util -e$(VERSION) debian/poms/asm-util.pom output/dist/lib/asm-util-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-xml -e$(VERSION) debian/poms/asm-xml.pom output/dist/lib/asm-xml-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-debug-all -e$(VERSION) debian/poms/asm-debug-all.pom output/dist/lib/all/asm-debug-all-$(VERSION).jar
+	# add osgi headers to asm3-all
+	jar umf debian/osgi.MF output/dist/lib/all/asm-all-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-all -e$(VERSION) debian/poms/asm-all.pom output/dist/lib/all/asm-all-$(VERSION).jar
 
 binary-post-install/lib$(PACKAGE)-java-doc::
 	dh_install -plib$(PACKAGE)-java-doc output/dist/doc/javadoc/user/* usr/share/doc/libasm3-java-doc/api