[jtreg] 02/05: Replaced the override_dh_auto_clean target with debian/clean

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Dec 8 21:10:12 UTC 2016


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

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

commit 1eabe06da7ba9a0524f62c288389dfccec53292d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 8 21:49:54 2016 +0100

    Replaced the override_dh_auto_clean target with debian/clean
---
 debian/changelog |  1 +
 debian/clean     |  4 ++++
 debian/rules     | 13 +++----------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3e5c87..6975766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jtreg (4.2-b03-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Replaced the override_dh_auto_clean target with debian/clean
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 08 Dec 2016 21:47:00 +0100
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..af30866
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+dist/
+build/
+jtdiff.1
+jtreg.1
diff --git a/debian/rules b/debian/rules
index aaab69f..7e67713 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@ VERSION      := $(shell dpkg-parsechangelog --show-field Version | sed 's/-.*//'
 BUILD_NUMBER := $(shell dpkg-parsechangelog --show-field Version | sed 's/.*-\(b[0-9]*\).*/\1/')
 DATE         := $(shell dpkg-parsechangelog --show-field Date)
 
+%:
+	dh $@ --with javahelper
+
 override_dh_auto_build:
 	ant -f make/build.xml \
 	    -Dant.jar=/usr/share/java/ant.jar \
@@ -24,13 +27,3 @@ override_dh_auto_build:
 	# Generate the manpages
 	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/bin/jtdiff > jtdiff.1
 	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/bin/jtreg > jtreg.1
-
-override_dh_auto_clean:
-	rm -rf dist
-	rm -rf build
-	rm -f jtdiff.1
-	rm -f jtreg.1
-	dh_auto_clean
-
-%:
-	dh $@ --with javahelper

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



More information about the pkg-java-commits mailing list