[cronometer] 04/05: debian/rules: Fixed the clean target

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Mar 5 11:39:58 UTC 2014


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

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

commit 4348f5d0b0b4e9aceae77006071ea3445d798b79
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 5 11:25:05 2014 +0100

    debian/rules: Fixed the clean target
---
 debian/changelog                        |  1 +
 debian/patches/04_add_clean_target.diff | 22 ----------------------
 debian/patches/series                   |  1 -
 debian/rules                            |  2 +-
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 163b1b4..44daa0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ cronometer (0.9.9+dfsg-1) UNRELEASED; urgency=medium
   * Standards-Version updated 3.9.5 (no changes)
   * Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
+  * debian/rules: Fixed the clean target
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Mar 2014 20:10:36 +0100
 
diff --git a/debian/patches/04_add_clean_target.diff b/debian/patches/04_add_clean_target.diff
deleted file mode 100644
index c006ff3..0000000
--- a/debian/patches/04_add_clean_target.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add a clean target
-Author: Ryan Kavanagh <ryanakca at kubuntu.org>
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-10-23
-Index: cronometer/build.xml
-===================================================================
---- cronometer.orig/build.xml	2011-10-23 11:04:02.758157243 -0400
-+++ cronometer/build.xml	2011-10-23 11:04:03.794162376 -0400
-@@ -60,6 +60,12 @@
- 		</jar>
- 	</target>
- 
-+        <target name="clean" description="clean generated files" >
-+                <delete dir="bin" />
-+                <delete file="lib/cronometer.jar" />
-+                <delete file="lib/docs.jar" />
-+        </target>
-+
-         <!-- Not needed in Debian
- 	<target name="launcher" depends="cronometer.jar,docs.jar" description="generate the executable" >
- 		<launch4j configFile="release/windows/launch4j.xml" />
diff --git a/debian/patches/series b/debian/patches/series
index afbf652..0f1e9e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_no_mswin_taskdefs.diff
 03_use_java_1.5.diff
-04_add_clean_target.diff
 05_dont_check_for_updates.diff
diff --git a/debian/rules b/debian/rules
index c29f36b..9ae49b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,4 +22,4 @@ override_dh_auto_install:
 	dh_auto_install
 
 override_dh_auto_clean:
-	dh_auto_clean
+	rm -Rf bin lib/cronometer.jar lib/docs.jar

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



More information about the pkg-java-commits mailing list