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 2738efa833853a60672b36ed2add028adf1a1469 Author: Niels Thykier <[email protected]> Date: Sat Sep 15 09:01:25 2012 +0000 Add missing class-path and use javahelper to find depends --- debian/changelog | 5 +++-- debian/control | 6 +++--- debian/rules | 13 +++++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e4e595..f60f3ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ libitext-java (2.1.7-4) UNRELEASED; urgency=low * Team upload. - * Correct the Class-Path for libitext-java. + * Add missing the Class-Path for the java packages. - Use javahelper to set the classpath. + - Use javahelper to compute dependencies. * Add versioned (Build-)Dependency on libbcprov-java due to #687694. - -- Niels Thykier <[email protected]> Sat, 15 Sep 2012 10:34:39 +0200 + -- Niels Thykier <[email protected]> Sat, 15 Sep 2012 10:47:08 +0200 libitext-java (2.1.7-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 681cfc8..0025291 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libitext-java Package: libitext-java Architecture: all -Depends: ${misc:Depends}, libbcprov-java (>= 1.46) +Depends: ${misc:Depends}, libbcprov-java (>= 1.46), ${java:Depends} 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. @@ -38,14 +38,14 @@ Description: Java Library to create and manipulate PDF on the fly Package: libitext-rtf-java Architecture: all -Depends: libitext-java (= ${binary:Version}), ${misc:Depends} +Depends: libitext-java (= ${binary:Version}), ${misc:Depends}, ${java:Depends} Description: Java Library to create and manipulate RTF files on the fly iText RTF is a library that allows you to generate RTF files on the fly in a similar fashion to iText itself. Package: libitext-rups-java Architecture: all -Depends: libitext-java (= ${binary:Version}), ${misc:Depends} +Depends: libitext-java (= ${binary:Version}), ${misc:Depends}, ${java:Depends} Description: graphical tool for Reading and Updating PDF Syntax (RUPS) iText RUPS provides a GUI for visualizing PDF files and investigating their internal structure. diff --git a/debian/rules b/debian/rules index 0c26992..2ce24b4 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,9 @@ 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/bcprov.jar +CORE_CLASS_PATH := /usr/share/java/bcprov.jar /usr/share/java/bcmail.jar /usr/share/java/bctsp.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 include /usr/share/gcj/debian_defaults ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) @@ -26,21 +28,28 @@ debian/stamp-makebuilddir: install/lib$(LIBRARY_PACKAGE)-java:: dh_installdirs -plib$(LIBRARY_PACKAGE)-java usr/share/java + # Add Class-Path + jh_manifest -c "$(CORE_CLASS_PATH)" lib/iText.jar install -m 644 lib/iText.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar dh_link -plib$(LIBRARY_PACKAGE)-java usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE).jar + jh_depends -plib$(LIBRARY_PACKAGE)-java install/lib$(LIBRARY_PACKAGE)-rtf-java:: dh_installdirs -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java # Add Class-Path - jh_manifest -c "$(CLASS_PATH)" lib/iText-rtf.jar + jh_manifest -c "$(RTF_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 + jh_depends -plib$(LIBRARY_PACKAGE)-rtf-java install/lib$(LIBRARY_PACKAGE)-rups-java:: dh_installdirs -plib$(LIBRARY_PACKAGE)-rups-java usr/share/java + # Add Class-Path + jh_manifest -c "$(RUPS_CLASS_PATH)" lib/iText-rups.jar install -m 644 lib/iText-rups.jar debian/lib$(LIBRARY_PACKAGE)-rups-java/usr/share/java/$(LIBRARY_PACKAGE)-rups-$(DEB_UPSTREAM_VERSION).jar dh_link -plib$(LIBRARY_PACKAGE)-rups-java usr/share/java/$(LIBRARY_PACKAGE)-rups-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE)-rups.jar + jh_depends -plib$(LIBRARY_PACKAGE)-rups-java ifeq ($(with_gcj_native),yes) install/libitext-java-gcj:: install/libitext-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libitext-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
