[pkg-java] r19155 - trunk/jarjar/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-10-05 08:09:24 +0000 (Wed, 05 Oct 2016)
New Revision: 19155

Added:
   trunk/jarjar/debian/libjarjar-java.poms
Modified:
   trunk/jarjar/debian/changelog
   trunk/jarjar/debian/control
   trunk/jarjar/debian/rules
Log:
Build with the DH sequencer instead of CDBS



Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog	2016-10-05 07:43:46 UTC (rev 19154)
+++ trunk/jarjar/debian/changelog	2016-10-05 08:09:24 UTC (rev 19155)
@@ -2,6 +2,7 @@
 
   * Team upload.
   * Include the SignatureRemapper class (new in ASM 5.1) in the final jar
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 05 Oct 2016 09:12:17 +0200
 

Modified: trunk/jarjar/debian/control
===================================================================
--- trunk/jarjar/debian/control	2016-10-05 07:43:46 UTC (rev 19154)
+++ trunk/jarjar/debian/control	2016-10-05 08:09:24 UTC (rev 19155)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
            Miguel Landaeta <nomadium at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, libasm-java (>= 5.0),
+Build-Depends: ant, debhelper (>= 9), default-jdk, libasm-java (>= 5.0),
  maven-repo-helper, libmaven2-core-java
 Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar

Added: trunk/jarjar/debian/libjarjar-java.poms
===================================================================
--- trunk/jarjar/debian/libjarjar-java.poms	                        (rev 0)
+++ trunk/jarjar/debian/libjarjar-java.poms	2016-10-05 08:09:24 UTC (rev 19155)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent --java-lib --set-version=1.4 --artifact=dist/jarjar-*.jar

Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules	2016-10-05 07:43:46 UTC (rev 19154)
+++ trunk/jarjar/debian/rules	2016-10-05 08:09:24 UTC (rev 19155)
@@ -1,23 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH := /usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:/usr/share/java/maven-plugin-api.jar
 
-VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//`
-MAVEN_VERSION := $(shell echo $(VERSION) | sed -e 's/+svn.*/-SNAPSHOT/')
+%:
+	dh $@ --with maven-repo-helper
 
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_build:
+	dh_auto_build -- jar javadoc
 
-DEB_JARS := asm asm-commons maven-plugin-api
-DEB_ANT_BUILD_TARGET := jar javadoc
+override_dh_auto_clean:
+	dh_auto_clean
+	dh_auto_build -- clean
 
-install/libjarjar-java::
-	# versioning workaround until 1.4 is released
-	mh_installpom -plibjarjar-java --no-parent --set-version=$(MAVEN_VERSION) pom.xml
-	mh_installjar -plibjarjar-java -l pom.xml --set-version=$(MAVEN_VERSION) dist/jarjar-*.jar
-
-clean::
-	mh_clean
-
 get-orig-source:
-	debian/orig-tar.sh --release $(DEB_UPSTREAM_VERSION)
+	uscan --download-current-version --force-download