[SCM] jenkins-commons-jelly packaging branch, master, updated. debian/1.1-jenkins-20110627-2-2-g6ba44ce

[James Page]

The following commit has been merged in the master branch:
commit 6ba44ce4dce2d25f8a975abbc879435093c9d20c
Author: James Page <james.page at ubuntu.com>
Date:   Mon Apr 30 12:00:10 2012 +0100

    d/rules,libjenkins-commons-jelly-java.poms: Refactor to Use  maven-debian-helper options to install jar files in /usr/share/java with correct names.
    
    * d/rules,libjenkins-commons-jelly-java.poms: Refactor to Use
      maven-debian-helper options to install jar files in /usr/share/java
      with correct names.
    * Bumped Standards-Version to 3.9.3:
      - d/copyright: Reference released version of DEP-5.

diff --git a/debian/changelog b/debian/changelog
index 84ec0b6..1188010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
-jenkins-commons-jelly (1.1-jenkins-20110627-2) unstable; urgency=low
+jenkins-commons-jelly (1.1-jenkins-20110627-3) unstable; urgency=low
 
   * Use new version of jenkins-commons-jexl:
     - d/maven.rules: Map to org.jenkins-ci groupID for maven artifact.
     - d/control: Build-Depend on libjenkins-commons-jexl-java (>= 
       1.1-jenkins-20111212) to pickup new groupID.
+  * d/rules,libjenkins-commons-jelly-java.poms: Refactor to Use 
+    maven-debian-helper options to install jar files in /usr/share/java
+    with correct names.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Reference released version of DEP-5.
 
- -- James Page <james.page at ubuntu.com>  Thu, 26 Apr 2012 15:49:06 +0100
+ -- James Page <james.page at ubuntu.com>  Mon, 30 Apr 2012 11:46:35 +0100
 
 jenkins-commons-jelly (1.1-jenkins-20110627-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e604347..440b926 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends-Indep:
  libmaven-javadoc-plugin-java,
  libservlet2.5-java,
  libxerces2-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://github.com/jenkinsci/jelly
 Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-commons-jelly.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-commons-jelly.git
diff --git a/debian/copyright b/debian/copyright
index a3fe1ba..c421c9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: Jenkins fork of Apache Commons Jelly
 Source: http://github.com/jenkinsci/jelly
 
diff --git a/debian/libjenkins-commons-jelly-java.poms b/debian/libjenkins-commons-jelly-java.poms
index cacaeb6..7363948 100644
--- a/debian/libjenkins-commons-jelly-java.poms
+++ b/debian/libjenkins-commons-jelly-java.poms
@@ -1,9 +1,9 @@
 pom.xml
-jelly-core/pom.xml
-jelly-tags/junit/pom.xml
-jelly-tags/define/pom.xml
-jelly-tags/xml/pom.xml
-jelly-tags/fmt/pom.xml
-jelly-tags/log/pom.xml
-jelly-tags/dynabean/pom.xml
+jelly-core/pom.xml --usj-name=jenkins-commons-jelly --java-lib
+jelly-tags/junit/pom.xml --usj-name=jenkins-commons-jelly-tags-junit --java-lib
+jelly-tags/define/pom.xml --usj-name=jenkins-commons-jelly-tags-define --java-lib
+jelly-tags/xml/pom.xml --usj-name=jenkins-commons-jelly-tags-xml --java-lib
+jelly-tags/fmt/pom.xml --usj-name=jenkins-commons-jelly-tags-fmt --java-lib
+jelly-tags/log/pom.xml --usj-name=jenkins-commons-jelly-tags-log --java-lib
+jelly-tags/dynabean/pom.xml --usj-name=jenkins-commons-jelly-tags-dynabean --java-lib
 
diff --git a/debian/rules b/debian/rules
index 0c37687..56fdaf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,12 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 DEB_MAVEN_BUILD_TARGET := install
-PACKAGE := jenkins-commons-jelly
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installjar -plib$(PACKAGE)-java jelly-core/pom.xml \
-		--usj-name=$(PACKAGE) -l jelly-core/target/commons-jelly-$(DEB_UPSTREAM_VERSION).jar \
-		--java-lib
-	for jar in junit define xml fmt log dynabean; do \
-	    mh_installjar -plib$(PACKAGE)-java jelly-tags/$${jar}/pom.xml --java-lib \
-        --usj-name=$(PACKAGE)-tags-$${jar} \
-		-l jelly-tags/$${jar}/target/commons-jelly-tags-$${jar}-$(DEB_UPSTREAM_VERSION).jar; \
-	done	
-	jh_classpath -plib$(PACKAGE)-java
- 
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
jenkins-commons-jelly packaging