[libitext-java] 71/76: More debian/rules simplifications with external debian/*.classpath files

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jul 28 22:46:38 UTC 2016


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 a7a08d89d57958533b5a9fd10f91a03b81d503bc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 28 19:16:13 2016 +0200

    More debian/rules simplifications with external debian/*.classpath files
---
 debian/libitext-java.classpath      |  1 +
 debian/libitext-rtf-java.classpath  |  1 +
 debian/libitext-rups-java.classpath |  1 +
 debian/rules                        | 14 +++-----------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/libitext-java.classpath b/debian/libitext-java.classpath
new file mode 100644
index 0000000..f108b27
--- /dev/null
+++ b/debian/libitext-java.classpath
@@ -0,0 +1 @@
+usr/share/java/itext.jar /usr/share/java/bcprov.jar /usr/share/java/bcmail.jar /usr/share/java/bcpkix.jar
diff --git a/debian/libitext-rtf-java.classpath b/debian/libitext-rtf-java.classpath
new file mode 100644
index 0000000..8e0bf35
--- /dev/null
+++ b/debian/libitext-rtf-java.classpath
@@ -0,0 +1 @@
+usr/share/java/itext-rtf.jar /usr/share/java/itext.jar /usr/share/java/pdfrenderer.jar /usr/share/java/dom4j.jar
diff --git a/debian/libitext-rups-java.classpath b/debian/libitext-rups-java.classpath
new file mode 100644
index 0000000..ab8e998
--- /dev/null
+++ b/debian/libitext-rups-java.classpath
@@ -0,0 +1 @@
+usr/share/java/itext-rups.jar /usr/share/java/itext.jar
diff --git a/debian/rules b/debian/rules
index 45bb31f..a69c8b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,27 +7,19 @@ JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar jar.rtf jar.rups
 DEB_ANT_CLEAN_TARGET :=
 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
 
 install/libitext-java::
-	# Add Class-Path
-	jh_manifest -c "$(CORE_CLASS_PATH)" lib/iText.jar
 	jh_depends -plibitext-java
 	mh_install -plibitext-java
+	jh_classpath -plibitext-java
 
 install/libitext-rtf-java::
-	# Add Class-Path
-	jh_manifest -c "$(RTF_CLASS_PATH)" lib/iText-rtf.jar
 	jh_depends -plibitext-rtf-java
-	mh_install -plibitext-java
+	jh_classpath -plibitext-rtf-java
 
 install/libitext-rups-java::
-	# Add Class-Path
-	jh_manifest -c "$(RUPS_CLASS_PATH)" lib/iText-rups.jar
 	jh_depends -plibitext-rups-java
-	mh_install -plibitext-java
+	jh_classpath -plibitext-rups-java
 
 clean::
 	mh_clean

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



More information about the pkg-java-commits mailing list