[libjaxp1.3-java] 36/36: Upload to unstable

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libjaxp1.3-java.

commit 15a9e53e3f58976a537baf2a491e236be85b6b5a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 19 00:22:11 2017 +0200

    Upload to unstable
---
 debian/changelog             |  5 +++--
 debian/clean                 |  1 +
 debian/control               |  1 -
 debian/libjaxp1.3-java.links |  1 +
 debian/libjaxp1.3-java.poms  |  5 ++---
 debian/rules                 | 26 ++++++--------------------
 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9706788..ce38fe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libjaxp1.3-java (1.3.05-3) UNRELEASED; urgency=medium
+libjaxp1.3-java (1.3.05-3) unstable; urgency=medium
 
   * Team upload.
   * Removed the GCJ package
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Jun 2017 23:08:18 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Jun 2017 00:22:01 +0200
 
 libjaxp1.3-java (1.3.05-2) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+build/
diff --git a/debian/control b/debian/control
index 954889a..9b608f6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Michael Koch <konqueror at gmx.de>,
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  default-jdk,
  javahelper,
diff --git a/debian/libjaxp1.3-java.links b/debian/libjaxp1.3-java.links
new file mode 100644
index 0000000..606d0c5
--- /dev/null
+++ b/debian/libjaxp1.3-java.links
@@ -0,0 +1 @@
+/usr/share/maven-repo/javax/xml/jaxp-api/1.3/jaxp-api-1.3.jar /usr/share/java/jaxp-1.3.jar
diff --git a/debian/libjaxp1.3-java.poms b/debian/libjaxp1.3-java.poms
index d0f12ec..28eb85b 100644
--- a/debian/libjaxp1.3-java.poms
+++ b/debian/libjaxp1.3-java.poms
@@ -1,3 +1,2 @@
-debian/jaxp.pom --no-parent
-debian/xml-apis.pom --no-parent
-
+debian/jaxp.pom     --no-parent            --artifact=build/jaxp-1.3.jar
+debian/xml-apis.pom --no-parent --java-lib --artifact=build/jaxp-1.3.jar
diff --git a/debian/rules b/debian/rules
index 25b8920..afb5752 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,22 @@
 #!/usr/bin/make -f
-# debian/rules file for libjaxp1.3-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := 1.3.05
 JAXP_VERSION         := 1.3
 JAVA_HOME            := /usr/lib/jvm/default-java
 
-clean::
-	rm -rf build debian/build-stamp
-	-rm -rf debian/tmp
+%:
+	dh $@ --with maven-repo-helper --with javahelper
 
-build/libjaxp1.3-java:: debian/build-stamp
-debian/build-stamp:
+override_dh_auto_build:
 	mkdir -p build/license
 
 	$(JAVA_HOME)/bin/javac -source 1.4 -d build `find javax org -name \*.java`
 	cp LICENSE.*.txt README.*.txt build/license
-	cd build && $(JAVA_HOME)/bin/jar cmf ../manifest.commons \
-		jaxp-1.3.jar javax license org
-	touch debian/build-stamp
-
-install/libjaxp1.3-java::
-	mh_installpoms -p$(PACKAGE);
-	mh_installjar -p$(PACKAGE) -l debian/xml-apis.pom build/jaxp-$(JAXP_VERSION).jar
-	mh_installjar -p$(PACKAGE) debian/jaxp.pom build/jaxp-$(JAXP_VERSION).jar /usr/share/java/jaxp-$(JAXP_VERSION).jar
+	cd build && $(JAVA_HOME)/bin/jar cmf ../manifest.commons jaxp-1.3.jar javax license org
 
 get-orig-pom:
 	wget -O debian/xml-apis.pom http://repository.sonatype.org/service/local/repositories/central/content/xml-apis/xml-apis/$(VERSION)/xml-apis-$(VERSION).pom
 	wget -O debian/jaxp.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/xml/jaxp-api/$(JAXP_VERSION)/jaxp-api-$(JAXP_VERSION).pom
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	-uscan --download-current-version --force-download --rename

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