[hawtjni] 02/04: debian/rules: Simplified the get-orig-source target by calling uscan

[Emmanuel Bourg]

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

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

commit 3baca7c626cf7db7b4a5f293ba5e5427a88d05ab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 5 01:32:29 2015 +0100

    debian/rules: Simplified the get-orig-source target by calling uscan
---
 debian/changelog |  1 +
 debian/control   |  1 -
 debian/rules     | 28 ++--------------------------
 debian/watch     |  3 +--
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 818340a..c156031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hawtjni (1.10-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Standards-Version updated to 3.9.6 (no changes)
+  * debian/rules: Simplified the get-orig-source target by calling uscan
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 Feb 2015 01:07:48 +0100
 
diff --git a/debian/control b/debian/control
index 4fd7b1a..436f63e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Miguel Landaeta <nomadium at debian.org>
 Build-Depends:
  default-jdk,
- dpkg-dev (>= 1.17),
  debhelper (>= 9),
  javahelper,
  maven-repo-helper
diff --git a/debian/rules b/debian/rules
index 7062ce5..2b24ab3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-UURL = https://github.com/fusesource/hawtjni.git
-PKD := $(abspath $(dir $(MAKEFILE_LIST)))
-PKG := hawtjni
-VER := $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d- -f1)
-
-
 %:
 	dh $@ --with javahelper --with maven-repo-helper
 
@@ -14,23 +8,5 @@ override_dh_auto_build:
 	jh_build hawtjni-runtime.jar hawtjni-runtime/src/main/java
 
 
-.PHONY: get-orig-source
-## http://wiki.debian.org/onlyjob/get-orig-source
-get-orig-source: $(PKG)_$(VER).orig.tar.xz
-	@
-
-$(PKG)_$(VER).orig.tar.xz:
-	@echo "# Cloning upstream git repository..."
-	git clone $(UURL) $(PKG)-$(VER)
-	@echo "# Clean-up..."
-	cd $(PKG)-$(VER) \
-	&& git checkout -b debiansource hawtjni-project-$(VER) \
-	&& echo "# Setting times..." \
-	&& for F in $$(git ls-tree -r --name-only HEAD); \
-	do touch --no-dereference -d "$$(git log -1 --format="%ai" -- "$$F")" "$$F"; done \
-	&& $(RM) -r \
-		.git
-	@echo "# Packing..."
-	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	| XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-	&& $(RM) -r "$(PKG)-$(VER)"
+get-orig-source:
+	uscan --download-current-version --force-download --rename
diff --git a/debian/watch b/debian/watch
index e948bdb..06d7be0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-http://repo1.maven.org/maven2/org/fusesource/hawtjni/hawtjni-runtime/ \
-(1[0-9\.]*)/
\ No newline at end of file
+https://github.com/fusesource/hawtjni/releases .*/hawtjni-project-([\d\.]+).tar.gz

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