[libitext-java] 70/76: Simplified debian/rules

[Emmanuel Bourg]

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

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

commit 6225274cf0e6b29c7a8430dc12ae2154327f984d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 28 19:05:43 2016 +0200

    Simplified debian/rules
---
 debian/ant.properties |  2 ++
 debian/rules          | 34 +++++++++++-----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index faacc44..d76ab1c 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1 +1,3 @@
 itext.jdk.core=1.5
+itext.src=..
+itext.lib=../lib
diff --git a/debian/rules b/debian/rules
index 5c1140a..45bb31f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,46 +4,34 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
 DEB_ANT_BUILD_TARGET := jar jar.rtf jar.rups
 DEB_ANT_CLEAN_TARGET :=
-DEB_ANT_BUILDFILE    := src/build.xml
 DEB_JARS             := bcprov bcmail bcpkix dom4j pdfrenderer
 CORE_CLASS_PATH      := /usr/share/java/bcprov.jar /usr/share/java/bcmail.jar /usr/share/java/bcpkix.jar
 RTF_CLASS_PATH       := /usr/share/java/itext.jar /usr/share/java/pdfrenderer.jar /usr/share/java/dom4j.jar
 RUPS_CLASS_PATH      := /usr/share/java/itext.jar
 
-LIBRARY_PACKAGE      := itext
-
-makebuilddir/lib$(LIBRARY_PACKAGE)-java:: debian/stamp-makebuilddir
-debian/stamp-makebuilddir:
-	ln -s . src
-	mkdir lib
-	touch $@
-
-install/lib$(LIBRARY_PACKAGE)-java::
+install/libitext-java::
 	# Add Class-Path
 	jh_manifest -c "$(CORE_CLASS_PATH)" lib/iText.jar
-	jh_depends -plib$(LIBRARY_PACKAGE)-java
-	mh_install -plib$(LIBRARY_PACKAGE)-java
+	jh_depends -plibitext-java
+	mh_install -plibitext-java
 
-install/lib$(LIBRARY_PACKAGE)-rtf-java::
+install/libitext-rtf-java::
 	# Add Class-Path
 	jh_manifest -c "$(RTF_CLASS_PATH)" lib/iText-rtf.jar
-	mh_install -plib$(LIBRARY_PACKAGE)-java
-	jh_depends -plib$(LIBRARY_PACKAGE)-rtf-java
+	jh_depends -plibitext-rtf-java
+	mh_install -plibitext-java
 
-install/lib$(LIBRARY_PACKAGE)-rups-java::
+install/libitext-rups-java::
 	# Add Class-Path
 	jh_manifest -c "$(RUPS_CLASS_PATH)" lib/iText-rups.jar
-	mh_install -plib$(LIBRARY_PACKAGE)-java
-	jh_depends -plib$(LIBRARY_PACKAGE)-rups-java
+	jh_depends -plibitext-rups-java
+	mh_install -plibitext-java
 
 clean::
-	dh_testdir
-	dh_testroot
 	mh_clean
-	-rm -rf build src lib debian/stamp-*
+	-rm -rf build lib debian/stamp-*
 
 get-orig-source:
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --force-download --download-current-version --rename

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