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

[Torsten Werner]

Author: twerner
Date: 2011-09-12 11:57:46 +0000 (Mon, 12 Sep 2011)
New Revision: 14854

Removed:
   trunk/asm3/debian/poms/
Modified:
   trunk/asm3/debian/changelog
   trunk/asm3/debian/libasm3-java.poms
   trunk/asm3/debian/rules
Log:
Use upstream provided pom files instead of shipping them in the debian
directory.

Modified: trunk/asm3/debian/changelog
===================================================================
--- trunk/asm3/debian/changelog	2011-09-12 11:50:57 UTC (rev 14853)
+++ trunk/asm3/debian/changelog	2011-09-12 11:57:46 UTC (rev 14854)
@@ -6,12 +6,13 @@
   * Change debian/watch to point to upstream's SVN repository. Add
     debian/orig-tar.sh.
   * Remove all prebuilt jar files from orig tarball.
-  * 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.
+  * Use upstream provided pom files instead of shipping them in the debian
+    directory.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 12 Sep 2011 13:28:10 +0200
+ -- Torsten Werner <twerner at debian.org>  Mon, 12 Sep 2011 13:50:38 +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:50:57 UTC (rev 14853)
+++ trunk/asm3/debian/libasm3-java.poms	2011-09-12 11:57:46 UTC (rev 14854)
@@ -1,10 +1,10 @@
-debian/poms/asm-parent.pom --no-parent
-debian/poms/asm-analysis.pom
-debian/poms/asm-commons.pom
-debian/poms/asm-tree.pom
-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
+archive/asm-parent.pom --no-parent
+archive/asm-analysis.pom
+archive/asm-commons.pom
+archive/asm-tree.pom
+archive/asm-util.pom
+archive/asm-xml.pom
+archive/asm.pom
+archive/asm-debug-all.pom
+archive/asm-all.pom
 

Modified: trunk/asm3/debian/rules
===================================================================
--- trunk/asm3/debian/rules	2011-09-12 11:50:57 UTC (rev 14853)
+++ trunk/asm3/debian/rules	2011-09-12 11:57:46 UTC (rev 14854)
@@ -5,33 +5,27 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-POM_VERSION          := 3.3.1
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := gnujaxp ant ant-junit junit xalan2 $(JAVA_HOME)/lib/tools.jar
 DEB_ANT_BUILD_TARGET := dist
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_ARGS         := -propertyfile debian/ant.properties -Dproduct.version=$(VERSION)
-MAVEN_REPO           := http://search.maven.org/remotecontent?filepath=asm
-POMLIST              := asm asm-all asm-analysis asm-commons asm-debug-all asm-parent asm-tree asm-util asm-xml
 
-get-orig-pom:
-	set -eu; for POM in $(POMLIST); do wget -O debian/poms/$$POM.pom $(MAVEN_REPO)/$$POM/$(POM_VERSION)/$$POM-$(POM_VERSION).pom; done
-
 get-orig-source:
-		-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
 binary-post-install/lib$(PACKAGE)-java::
 	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
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3 -e$(VERSION) archive/asm.pom output/dist/lib/asm-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-analysis -e$(VERSION) archive/asm-analysis.pom output/dist/lib/asm-analysis-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-commons -e$(VERSION) archive/asm-commons.pom output/dist/lib/asm-commons-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-tree -e$(VERSION) archive/asm-tree.pom output/dist/lib/asm-tree-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-util -e$(VERSION) archive/asm-util.pom output/dist/lib/asm-util-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-xml -e$(VERSION) archive/asm-xml.pom output/dist/lib/asm-xml-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-debug-all -e$(VERSION) archive/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
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-all -e$(VERSION) archive/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