Author: nomadium-guest Date: 2012-04-18 15:08:25 +0000 (Wed, 18 Apr 2012) New Revision: 15962
Added: trunk/libitext-java/debian/patches/01_allow_standard_input.patch Removed: trunk/libitext-java/debian/patches/01_allow_standard_input.diff Modified: trunk/libitext-java/debian/changelog trunk/libitext-java/debian/compat trunk/libitext-java/debian/control trunk/libitext-java/debian/copyright trunk/libitext-java/debian/patches/series trunk/libitext-java/debian/rules Log: [ Miguel Landaeta ] * Team upload. * Add Build-Depends on gcj-native-helper. * Remove Michael Koch from Uploaders list. Thanks for your work on this package. (Closes: #654069). [ Jari Aalto ] * Update to Standards-Version to 3.9.3 and debhelper to 9. * Change obsolete default-jdk-builddep to default-jdk. (Closes: #669157). * Replace debian/patches/01* template with headers and rename file to standard *.patch extension. * Fix copyright-refers-to-symlink-license (Lintian). * Fix debian-control-has-unusual-field-spacing (Lintian). * Fix duplicate-short-description (Lintian). * Fix needless-dependency-on-jre (Lintian). * Fix missing-classpath (Lintian). Modified: trunk/libitext-java/debian/changelog =================================================================== --- trunk/libitext-java/debian/changelog 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/changelog 2012-04-18 15:08:25 UTC (rev 15962) @@ -1,3 +1,24 @@ +libitext-java (2.1.7-3) UNRELEASED; urgency=low + + [ Miguel Landaeta ] + * Team upload. + * Add Build-Depends on gcj-native-helper. + * Remove Michael Koch from Uploaders list. + Thanks for your work on this package. (Closes: #654069). + + [ Jari Aalto ] + * Update to Standards-Version to 3.9.3 and debhelper to 9. + * Change obsolete default-jdk-builddep to default-jdk. (Closes: #669157). + * Replace debian/patches/01* template with headers and rename file to + standard *.patch extension. + * Fix copyright-refers-to-symlink-license (Lintian). + * Fix debian-control-has-unusual-field-spacing (Lintian). + * Fix duplicate-short-description (Lintian). + * Fix needless-dependency-on-jre (Lintian). + * Fix missing-classpath (Lintian). + + -- Miguel Landaeta <[email protected]> Tue, 17 Apr 2012 18:37:46 -0430 + libitext-java (2.1.7-2) unstable; urgency=low [ Michael Koch ] Modified: trunk/libitext-java/debian/compat =================================================================== --- trunk/libitext-java/debian/compat 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/compat 2012-04-18 15:08:25 UTC (rev 15962) @@ -1 +1 @@ -7 +9 Modified: trunk/libitext-java/debian/control =================================================================== --- trunk/libitext-java/debian/control 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/control 2012-04-18 15:08:25 UTC (rev 15962) @@ -2,17 +2,17 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Michael Koch <[email protected]>, Adriaan Peeters <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant, libbcprov-java, - libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java -Standards-Version: 3.8.4 +Uploaders: Adriaan Peeters <[email protected]>, Torsten Werner <[email protected]> +Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java, + libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper +Standards-Version: 3.9.3 Homepage: http://www.lowagie.com/iText/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libitext-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libitext-java Package: libitext-java Architecture: all -Depends: default-jre | java2-runtime, ${misc:Depends} +Depends: ${misc: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. @@ -37,14 +37,14 @@ Package: libitext-rtf-java Architecture: all -Depends: default-jre | java2-runtime, libitext-java (= ${binary:Version}), ${misc:Depends} +Depends: libitext-java (= ${binary:Version}), ${misc: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: default-jre | java2-runtime, libitext-java (= ${binary:Version}), ${misc:Depends} +Depends: libitext-java (= ${binary:Version}), ${misc: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. Modified: trunk/libitext-java/debian/copyright =================================================================== --- trunk/libitext-java/debian/copyright 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/copyright 2012-04-18 15:08:25 UTC (rev 15962) @@ -86,7 +86,7 @@ Library general Public License for more details. On Debian systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL'. +Public License can be found in `/usr/share/common-licenses/LGPL-2'. Mozilla Public License Version 1.1 Deleted: trunk/libitext-java/debian/patches/01_allow_standard_input.diff =================================================================== --- trunk/libitext-java/debian/patches/01_allow_standard_input.diff 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/patches/01_allow_standard_input.diff 2012-04-18 15:08:25 UTC (rev 15962) @@ -1,26 +0,0 @@ -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- libitext-java-2.1.7.orig/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java -+++ libitext-java-2.1.7/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java -@@ -99,7 +99,11 @@ public class RandomAccessFileOrArray imp - } - } - else { -- InputStream is = BaseFont.getResourceStream(filename); -+ InputStream is; -+ if( filename.equals("-")) -+ is = System.in; -+ else -+ is = BaseFont.getResourceStream(filename); - if (is == null) - throw new IOException(filename + " not found as file or resource."); - try { Copied: trunk/libitext-java/debian/patches/01_allow_standard_input.patch (from rev 15960, trunk/libitext-java/debian/patches/01_allow_standard_input.diff) =================================================================== --- trunk/libitext-java/debian/patches/01_allow_standard_input.patch (rev 0) +++ trunk/libitext-java/debian/patches/01_allow_standard_input.patch 2012-04-18 15:08:25 UTC (rev 15962) @@ -0,0 +1,18 @@ +From: +Subject: + +--- libitext-java-2.1.7.orig/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java ++++ libitext-java-2.1.7/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java +@@ -99,7 +99,11 @@ public class RandomAccessFileOrArray imp + } + } + else { +- InputStream is = BaseFont.getResourceStream(filename); ++ InputStream is; ++ if( filename.equals("-")) ++ is = System.in; ++ else ++ is = BaseFont.getResourceStream(filename); + if (is == null) + throw new IOException(filename + " not found as file or resource."); + try { Modified: trunk/libitext-java/debian/patches/series =================================================================== --- trunk/libitext-java/debian/patches/series 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/patches/series 2012-04-18 15:08:25 UTC (rev 15962) @@ -1 +1 @@ -01_allow_standard_input.diff +01_allow_standard_input.patch Modified: trunk/libitext-java/debian/rules =================================================================== --- trunk/libitext-java/debian/rules 2012-04-18 06:52:32 UTC (rev 15961) +++ trunk/libitext-java/debian/rules 2012-04-18 15:08:25 UTC (rev 15962) @@ -9,6 +9,7 @@ DEB_ANT_CLEAN_TARGET := DEB_ANT_BUILDFILE := src/build.xml DEB_JARS := bcprov bcmail bctsp dom4j pdfrenderer +CLASS_PATH := /usr/share/java/itext.jar include /usr/share/gcj/debian_defaults ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) @@ -30,6 +31,15 @@ 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 + # 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
