[asm] 08/11: Simplified debian/rules

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository asm.

commit 65c1096eeb8b27182b6f914a61d76dcf4a937675
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 21 18:03:45 2016 +0100

    Simplified debian/rules
---
 debian/changelog                |  2 +-
 debian/libasm-java-doc.dirs     |  1 -
 debian/libasm-java-doc.doc-base |  4 ++--
 debian/libasm-java-doc.install  |  2 ++
 debian/libasm-java.poms         | 18 +++++++++---------
 debian/rules                    | 24 ++++--------------------
 6 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35c60fc..f429026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,13 +3,13 @@ asm (5.1-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Updated the OSGi metadata in debian/osgi
-    - Updated the version in debian/libasm-java.poms
   * Renamed the package back to libasm-java
   * Removed the unused build dependency on libow-util-ant-tasks-java
   * Set the locale when generating the Javadoc to make the build reproducible
   * Standards-Version updated to 3.9.7 (no changes)
   * Removed rm-sigtest.patch
   * Updated the package description
+  * Simplified debian/rules
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Oct 2015 20:54:01 +0100
 
diff --git a/debian/libasm-java-doc.dirs b/debian/libasm-java-doc.dirs
deleted file mode 100644
index 6ac4be2..0000000
--- a/debian/libasm-java-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libasm-java-doc
diff --git a/debian/libasm-java-doc.doc-base b/debian/libasm-java-doc.doc-base
index 671fa7c..34ca795 100644
--- a/debian/libasm-java-doc.doc-base
+++ b/debian/libasm-java-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: This is the API Javadoc provided by the Objectweb
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libasm-java-doc/api/index.html
-Files: /usr/share/doc/libasm-java-doc/api/*.html
+Index: /usr/share/doc/libasm-java/api/index.html
+Files: /usr/share/doc/libasm-java/api/*.html
diff --git a/debian/libasm-java-doc.install b/debian/libasm-java-doc.install
new file mode 100644
index 0000000..ef2b2ee
--- /dev/null
+++ b/debian/libasm-java-doc.install
@@ -0,0 +1,2 @@
+output/dist/doc/javadoc/user/* usr/share/doc/libasm-java/api
+output/dist/examples           usr/share/doc/libasm-java
diff --git a/debian/libasm-java.poms b/debian/libasm-java.poms
index ff61676..7f55662 100644
--- a/debian/libasm-java.poms
+++ b/debian/libasm-java.poms
@@ -1,9 +1,9 @@
-output/dist/lib/asm-parent-5.1.pom --no-parent
-output/dist/lib/asm-analysis-5.1.pom
-output/dist/lib/asm-commons-5.1.pom
-output/dist/lib/asm-tree-5.1.pom
-output/dist/lib/asm-util-5.1.pom
-output/dist/lib/asm-xml-5.1.pom
-output/dist/lib/asm-5.1.pom
-output/dist/lib/all/asm-debug-all-5.1.pom
-output/dist/lib/all/asm-all-5.1.pom
+archive/asm-parent.pom    --no-parent --has-package-version
+archive/asm-analysis.pom  --java-lib --has-package-version --artifact=output/dist/lib/asm-analysis-*.jar
+archive/asm-commons.pom   --java-lib --has-package-version --artifact=output/dist/lib/asm-commons-*.jar
+archive/asm-tree.pom      --java-lib --has-package-version --artifact=output/dist/lib/asm-tree-*.jar
+archive/asm-util.pom      --java-lib --has-package-version --artifact=output/dist/lib/asm-util-*.jar
+archive/asm-xml.pom       --java-lib --has-package-version --artifact=output/dist/lib/asm-xml-*.jar
+archive/asm.pom           --java-lib --has-package-version --artifact=output/dist/lib/asm-5*.jar
+archive/asm-debug-all.pom --java-lib --has-package-version --artifact=output/dist/lib/all/asm-debug-all-*.jar
+archive/asm-all.pom       --java-lib --has-package-version --artifact=output/dist/lib/all/asm-all-*.jar
diff --git a/debian/rules b/debian/rules
index 30449c3..197ef4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,31 +6,15 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := libasm-java
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant ant-junit junit xalan2 $(JAVA_HOME)/lib/tools.jar
+DEB_JARS             := ant ant-junit junit
 DEB_ANT_BUILD_TARGET := jar jdoc examples
-DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_ARGS         := -propertyfile debian/ant.properties -Dproduct.version=$(VERSION)
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename
 
-binary-post-install/$(PACKAGE):: 
-	mh_installpoms -p$(PACKAGE) -e$(VERSION)
-	mh_installjar -p$(PACKAGE) -l --usj-name=asm -e$(VERSION) \
-		output/dist/lib/asm-$(VERSION).pom output/dist/lib/asm-$(VERSION).jar
-	for j in analysis commons tree util xml; do \
-		mh_installjar -p$(PACKAGE) -l --usj-name=asm-$$j -e$(VERSION) \
-			output/dist/lib/asm-$$j-$(VERSION).pom output/dist/lib/asm-$$j-$(VERSION).jar; \
-	done ;
-	for j in debug-all all; do \
-		mh_installjar -p$(PACKAGE) -l --usj-name=asm-$$j -e$(VERSION) \
-			output/dist/lib/all/asm-$$j-$(VERSION).pom output/dist/lib/all/asm-$$j-$(VERSION).jar; \
-	done ;
-
-binary-post-install/$(PACKAGE)-doc::
-	dh_install -p$(PACKAGE)-doc output/dist/doc/javadoc/user/* usr/share/doc/$(PACKAGE)-doc/api
-	dh_install -p$(PACKAGE)-doc output/dist/examples usr/share/doc/$(PACKAGE)-doc
+binary-post-install/$(PACKAGE)::
+	mh_install -e$(VERSION)
 
 clean::
 	mh_clean
-

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