[libitext-java] 50/76: Add libbcprov-java dep and fix classpath

[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 f2e5f619680b58fb200cf3b808b94fc2c023edd7
Author: Niels Thykier <nthykier at debian.org>
Date:   Sat Sep 15 08:41:06 2012 +0000

    Add libbcprov-java dep and fix classpath
---
 debian/changelog | 10 ++++++++++
 debian/control   |  7 ++++---
 debian/rules     | 12 +++---------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70be6ba..1e4e595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libitext-java (2.1.7-4) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Correct the Class-Path for libitext-java.
+    - Use javahelper to set the classpath.
+  * Add versioned (Build-)Dependency on libbcprov-java due to
+    #687694.
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 15 Sep 2012 10:34:39 +0200
+
 libitext-java (2.1.7-3) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/control b/debian/control
index 45d64d1..681cfc8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Adriaan Peeters <apeeters at lashout.net>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java,
- libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java (>= 1.46),
+ libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper,
+ javahelper (>= 0.43)
 Standards-Version: 3.9.3
 Homepage: http://www.lowagie.com/iText/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libitext-java
@@ -12,7 +13,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libitext-java
 
 Package: libitext-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libbcprov-java (>= 1.46)
 Suggests: libitext-java-gcj
 Description: Java Library to create and manipulate PDF on the fly
  iText is a library that allows you to generate PDF files on the fly.
diff --git a/debian/rules b/debian/rules
index 70f619a..0c26992 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_ANT_BUILD_TARGET := jar jar.rtf jar.rups
 DEB_ANT_CLEAN_TARGET :=
 DEB_ANT_BUILDFILE    := src/build.xml
 DEB_JARS             := bcprov bcmail bctsp dom4j pdfrenderer
-CLASS_PATH           := /usr/share/java/itext.jar
+CLASS_PATH           := /usr/share/java/bcprov.jar
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -31,14 +31,8 @@ install/lib$(LIBRARY_PACKAGE)-java::
 
 install/lib$(LIBRARY_PACKAGE)-rtf-java::
 	dh_installdirs -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java
-	# repack with Class-Path
-	cd lib && \
-	jar=iText-rtf.jar ; \
-	file=META-INF/MANIFEST.MF ; \
-	jar -xf $$jar && \
-		sed -i '/^[ \r\t]*$$/d' $$file && \
-		/bin/echo -e "Class-Path: $(CLASS_PATH)\r" >> $$file && \
-	jar -cfm $$jar $$file com
+	# Add Class-Path
+	jh_manifest -c "$(CLASS_PATH)" lib/iText-rtf.jar
 	# install
 	install -m 644 lib/iText-rtf.jar debian/lib$(LIBRARY_PACKAGE)-rtf-java/usr/share/java/$(LIBRARY_PACKAGE)-rtf-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java/$(LIBRARY_PACKAGE)-rtf-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE)-rtf.jar

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