Author: ebourg-guest Date: 2013-07-16 11:53:37 +0000 (Tue, 16 Jul 2013) New Revision: 17039
Added: tags/libitext-java/2.1.7-7/ tags/libitext-java/2.1.7-7/debian/changelog tags/libitext-java/2.1.7-7/debian/control tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_compatibility.patch tags/libitext-java/2.1.7-7/debian/patches/series Removed: tags/libitext-java/2.1.7-7/debian/changelog tags/libitext-java/2.1.7-7/debian/control tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_1.47_port.patch tags/libitext-java/2.1.7-7/debian/patches/series Log: [svn-buildpackage] Tagging libitext-java 2.1.7-7 Deleted: tags/libitext-java/2.1.7-7/debian/changelog =================================================================== --- trunk/libitext-java/debian/changelog 2013-07-15 17:30:14 UTC (rev 17033) +++ tags/libitext-java/2.1.7-7/debian/changelog 2013-07-16 11:53:37 UTC (rev 17039) @@ -1,200 +0,0 @@ -libitext-java (2.1.7-6) unstable; urgency=low - - * Team upload. - * Upload to unstable. (Closes: #710410) - - -- tony mancill <[email protected]> Thu, 30 May 2013 23:12:41 -0700 - -libitext-java (2.1.7-5) experimental; urgency=low - - * Team upload. - * Update to Standards-Version to 3.9.4 (no change required) - * Added a patch to compile against Bouncy Castle 1.47 or later. - * debian/watch: Changed to match only the 2.x releases - * debian/rules: Added a get-orig-source target - - -- Emmanuel Bourg <[email protected]> Fri, 29 Mar 2013 22:47:29 +0100 - -libitext-java (2.1.7-4) unstable; urgency=low - - * Team upload. - * 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 11:02:37 +0200 - -libitext-java (2.1.7-3) unstable; 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 ] - * Removed Gerardo Curiel from Uploaders (Closes: #553081). - - [ Onkar Shinde ] - * Move -gcj package from 'Recommends' to 'Suggests' as discussed on Debian - Java mailing list. - * Update standards version to 3.8.4. - * Convert direct code changes to patch. - * Remove simple-patchsys inclusion from rules file. - * Convert package to source format 3.0. - - -- Debian Java Maintainers <[email protected]> Tue, 18 May 2010 20:08:26 +0530 - -libitext-java (2.1.7-1) unstable; urgency=low - - * New upstream release (Closes: #549347). - * Build-Depends on libbctsp-java. - * Build-Depends on debhelper (>= 7). - * Added missing Depends on ${misc:Depends}. - * Added Vcs-Svn and Vcs-Browser fields. - * Updated Standards-Version 3.8.3. - - -- Michael Koch <[email protected]> Fri, 02 Oct 2009 21:23:15 +0200 - -libitext-java (2.1.5-1) unstable; urgency=low - - * New upstream version. - * Build packages natively compiled for gcj. - * Handle reading PDF's from stdin. - - -- Matthias Klose <[email protected]> Mon, 27 Apr 2009 23:59:05 +0200 - -libitext-java (2.1.4-1) unstable; urgency=low - - * New upstream release - - -- Adriaan Peeters <[email protected]> Sun, 23 Nov 2008 12:26:51 +0100 - -libitext-java (2.1.3-1) unstable; urgency=low - - [Adriaan Peeters] - * New upstream release (Closes: #447359) - * Removed patches: - - debian/patches/01_jpeg_encoder_classpath.patch - - debian/patches/02_ant_properties.patch - * debian/control: - - Added libitext-rtf-java and libitext-rups-java binary packages - - Added myself to Uploaders - - Added Homepage - - Bumped Standards-Version from 3.7.2 to 3.8.0, no changes needed - - Increased dephelper Build-Depends to >= 5.0.0 - - Only use Build-Depends, do not depend on libservlet2.3-java, ecj - - Rewrote short and long descriptions - * debian/rules: - - Added DEB_ANT_BUILDFILE - - Removed ANT_ARGS - - Removed API_VERSION, use DEB_UPSTREAM_VERSION instead - - Compiled iText.jar is in lib/ instead of build/bin/ - - Use dh_link instead of ln -s - - Added build targets for libitext-rtf-java and libitext-rups-java - * Bumped debian/compat from 4 to 5 - * Added debian/watch - - [Matthias Klose] - * (Build-)depend on default-jre/-jdk. - - [ Torsten Werner ] - * Add missing Build-Depends. - * Add myself to Uploaders. - * Add copyright statement to debian/copyright. - * Some lintian fixes. - * Add more copyright and license information to debian/copyright. - - -- Torsten Werner <[email protected]> Sun, 31 Aug 2008 01:03:45 +0200 - -libitext-java (1.4.5-3) unstable; urgency=low - - * Build-Depend on ecj instead of ecj-bootstrap. Closes: #442958. - - -- Michael Koch <[email protected]> Tue, 18 Sep 2007 20:57:45 +0200 - -libitext-java (1.4.5-2) unstable; urgency=low - - * Removed Suggests on libitext-java-doc. This package doesn't exist. - * Removed two trailing empty lines. - * Added myself to Uploaders. - - -- Michael Koch <[email protected]> Thu, 02 Aug 2007 07:30:43 +0200 - -libitext-java (1.4.5-1) unstable; urgency=low - - * New upstream release - * debian/rules modified due to a new build.xml file - * Patched Pdfgraphics2d.java to remove privative dependencie on com.sun.image.codec.jpeg.* - (more information on - http://developer.classpath.org/mediation/ClasspathMigration#head-d4ee9efe53a641e29ffdcd96e985bf38bbc671c1 ) - * ant/.ant.properties paths fixed - * Build package with the packages provided by java-gcj-compat-dev - * Removed unused README.Debian - * Removed unused debian/patches/01libitext-java-addbuildscript.patch - - - -- Gerardo Curiel <[email protected]> Thu, 21 Sep 2006 00:08:53 -0400 - -libitext-java (1.02b-5) unstable; urgency=low - - - * debian/rules,debian/control: Build package with Kaffe to be able - to move the package to main. - * debian/rules: Converted rules to the cdbs - * debian/libitext-java-doc.docs,libitext-java.dirs: Removed partly - generated files, and used the debhelpers direct in the rules. - * debian/patches/01libitext-java-addbuildscript.patch: Used a patch - instead to have this file direct to the diff.gz - * debian/rules: Renamed jar files like iTextXML.jar to - itext-xml-1.02b.jar - * debian/rules,debian/control: Depending on libservlet2.3-java - - -- Stephan Michels <[email protected]> Thu, 23 Feb 2006 07:28:32 +0100 - -libitext-java (1.02b-4) unstable; urgency=high - - * Applied patch proposed by Andreas Jochens related to - FTBFS: JAVA_HOME is not defined correctly. (Closes: Bug#306296) - - -- Christian Bayle <[email protected]> Mon, 25 Apr 2005 21:56:25 +0200 - -libitext-java (1.02b-3) unstable; urgency=low - - * Rebuild with .orig tarball - - -- Christian Bayle <[email protected]> Thu, 19 Feb 2004 21:13:08 +0100 - -libitext-java (1.02b-1) unstable; urgency=low - - * Removed depend on gij-3.2 (closes #232871) - * New upstream version - - -- Christian Bayle <[email protected]> Thu, 19 Feb 2004 20:40:48 +0100 - -libitext-java (1.00-1) unstable; urgency=low - - * Initial Release. - - -- Christian Bayle <[email protected]> Mon, 7 Jul 2003 00:47:01 +0200 - -Local variables: -mode: debian-changelog -End: Copied: tags/libitext-java/2.1.7-7/debian/changelog (from rev 17036, trunk/libitext-java/debian/changelog) =================================================================== --- tags/libitext-java/2.1.7-7/debian/changelog (rev 0) +++ tags/libitext-java/2.1.7-7/debian/changelog 2013-07-16 11:53:37 UTC (rev 17039) @@ -0,0 +1,207 @@ +libitext-java (2.1.7-7) unstable; urgency=low + + * Patched to compile against Bouncy Castle 1.49 + * Use canonical URLs for the Vcs-* fields + + -- Emmanuel Bourg <[email protected]> Mon, 15 Jul 2013 23:57:34 +0200 + +libitext-java (2.1.7-6) unstable; urgency=low + + * Team upload. + * Upload to unstable. (Closes: #710410) + + -- tony mancill <[email protected]> Thu, 30 May 2013 23:12:41 -0700 + +libitext-java (2.1.7-5) experimental; urgency=low + + * Team upload. + * Update to Standards-Version to 3.9.4 (no change required) + * Added a patch to compile against Bouncy Castle 1.47 or later. + * debian/watch: Changed to match only the 2.x releases + * debian/rules: Added a get-orig-source target + + -- Emmanuel Bourg <[email protected]> Fri, 29 Mar 2013 22:47:29 +0100 + +libitext-java (2.1.7-4) unstable; urgency=low + + * Team upload. + * 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 11:02:37 +0200 + +libitext-java (2.1.7-3) unstable; 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 ] + * Removed Gerardo Curiel from Uploaders (Closes: #553081). + + [ Onkar Shinde ] + * Move -gcj package from 'Recommends' to 'Suggests' as discussed on Debian + Java mailing list. + * Update standards version to 3.8.4. + * Convert direct code changes to patch. + * Remove simple-patchsys inclusion from rules file. + * Convert package to source format 3.0. + + -- Debian Java Maintainers <[email protected]> Tue, 18 May 2010 20:08:26 +0530 + +libitext-java (2.1.7-1) unstable; urgency=low + + * New upstream release (Closes: #549347). + * Build-Depends on libbctsp-java. + * Build-Depends on debhelper (>= 7). + * Added missing Depends on ${misc:Depends}. + * Added Vcs-Svn and Vcs-Browser fields. + * Updated Standards-Version 3.8.3. + + -- Michael Koch <[email protected]> Fri, 02 Oct 2009 21:23:15 +0200 + +libitext-java (2.1.5-1) unstable; urgency=low + + * New upstream version. + * Build packages natively compiled for gcj. + * Handle reading PDF's from stdin. + + -- Matthias Klose <[email protected]> Mon, 27 Apr 2009 23:59:05 +0200 + +libitext-java (2.1.4-1) unstable; urgency=low + + * New upstream release + + -- Adriaan Peeters <[email protected]> Sun, 23 Nov 2008 12:26:51 +0100 + +libitext-java (2.1.3-1) unstable; urgency=low + + [Adriaan Peeters] + * New upstream release (Closes: #447359) + * Removed patches: + - debian/patches/01_jpeg_encoder_classpath.patch + - debian/patches/02_ant_properties.patch + * debian/control: + - Added libitext-rtf-java and libitext-rups-java binary packages + - Added myself to Uploaders + - Added Homepage + - Bumped Standards-Version from 3.7.2 to 3.8.0, no changes needed + - Increased dephelper Build-Depends to >= 5.0.0 + - Only use Build-Depends, do not depend on libservlet2.3-java, ecj + - Rewrote short and long descriptions + * debian/rules: + - Added DEB_ANT_BUILDFILE + - Removed ANT_ARGS + - Removed API_VERSION, use DEB_UPSTREAM_VERSION instead + - Compiled iText.jar is in lib/ instead of build/bin/ + - Use dh_link instead of ln -s + - Added build targets for libitext-rtf-java and libitext-rups-java + * Bumped debian/compat from 4 to 5 + * Added debian/watch + + [Matthias Klose] + * (Build-)depend on default-jre/-jdk. + + [ Torsten Werner ] + * Add missing Build-Depends. + * Add myself to Uploaders. + * Add copyright statement to debian/copyright. + * Some lintian fixes. + * Add more copyright and license information to debian/copyright. + + -- Torsten Werner <[email protected]> Sun, 31 Aug 2008 01:03:45 +0200 + +libitext-java (1.4.5-3) unstable; urgency=low + + * Build-Depend on ecj instead of ecj-bootstrap. Closes: #442958. + + -- Michael Koch <[email protected]> Tue, 18 Sep 2007 20:57:45 +0200 + +libitext-java (1.4.5-2) unstable; urgency=low + + * Removed Suggests on libitext-java-doc. This package doesn't exist. + * Removed two trailing empty lines. + * Added myself to Uploaders. + + -- Michael Koch <[email protected]> Thu, 02 Aug 2007 07:30:43 +0200 + +libitext-java (1.4.5-1) unstable; urgency=low + + * New upstream release + * debian/rules modified due to a new build.xml file + * Patched Pdfgraphics2d.java to remove privative dependencie on com.sun.image.codec.jpeg.* + (more information on + http://developer.classpath.org/mediation/ClasspathMigration#head-d4ee9efe53a641e29ffdcd96e985bf38bbc671c1 ) + * ant/.ant.properties paths fixed + * Build package with the packages provided by java-gcj-compat-dev + * Removed unused README.Debian + * Removed unused debian/patches/01libitext-java-addbuildscript.patch + + + -- Gerardo Curiel <[email protected]> Thu, 21 Sep 2006 00:08:53 -0400 + +libitext-java (1.02b-5) unstable; urgency=low + + + * debian/rules,debian/control: Build package with Kaffe to be able + to move the package to main. + * debian/rules: Converted rules to the cdbs + * debian/libitext-java-doc.docs,libitext-java.dirs: Removed partly + generated files, and used the debhelpers direct in the rules. + * debian/patches/01libitext-java-addbuildscript.patch: Used a patch + instead to have this file direct to the diff.gz + * debian/rules: Renamed jar files like iTextXML.jar to + itext-xml-1.02b.jar + * debian/rules,debian/control: Depending on libservlet2.3-java + + -- Stephan Michels <[email protected]> Thu, 23 Feb 2006 07:28:32 +0100 + +libitext-java (1.02b-4) unstable; urgency=high + + * Applied patch proposed by Andreas Jochens related to + FTBFS: JAVA_HOME is not defined correctly. (Closes: Bug#306296) + + -- Christian Bayle <[email protected]> Mon, 25 Apr 2005 21:56:25 +0200 + +libitext-java (1.02b-3) unstable; urgency=low + + * Rebuild with .orig tarball + + -- Christian Bayle <[email protected]> Thu, 19 Feb 2004 21:13:08 +0100 + +libitext-java (1.02b-1) unstable; urgency=low + + * Removed depend on gij-3.2 (closes #232871) + * New upstream version + + -- Christian Bayle <[email protected]> Thu, 19 Feb 2004 20:40:48 +0100 + +libitext-java (1.00-1) unstable; urgency=low + + * Initial Release. + + -- Christian Bayle <[email protected]> Mon, 7 Jul 2003 00:47:01 +0200 + +Local variables: +mode: debian-changelog +End: Deleted: tags/libitext-java/2.1.7-7/debian/control =================================================================== --- trunk/libitext-java/debian/control 2013-07-15 17:30:14 UTC (rev 17033) +++ tags/libitext-java/2.1.7-7/debian/control 2013-07-16 11:53:37 UTC (rev 17039) @@ -1,52 +0,0 @@ -Source: libitext-java -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Adriaan Peeters <[email protected]>, Torsten Werner <[email protected]>, - Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java (>= 1.48), - libbcmail-java, libbcpkix-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper, - javahelper (>= 0.43) -Standards-Version: 3.9.4 -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: ${misc:Depends}, libbcprov-java (>= 1.48), ${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. - The iText classes are very useful for people who need to generate read-only, - platform independent documents containing text, lists, tables and images. - The library is especially useful in combination with Java(TM) - technology-based Servlets: The look and feel of HTML is browser dependent; - with iText and PDF you can control exactly how your servlet's output will look. - -Package: libitext-java-gcj -Architecture: any -Depends: libitext-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -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. - The iText classes are very useful for people who need to generate read-only, - platform independent documents containing text, lists, tables and images. - The library is especially useful in combination with Java(TM) - technology-based Servlets: The look and feel of HTML is browser dependent; - with iText and PDF you can control exactly how your servlet's output will look. - . - This package contains the natively compiled code for use by gij. - -Package: libitext-rtf-java -Architecture: all -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}, ${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. Copied: tags/libitext-java/2.1.7-7/debian/control (from rev 17034, trunk/libitext-java/debian/control) =================================================================== --- tags/libitext-java/2.1.7-7/debian/control (rev 0) +++ tags/libitext-java/2.1.7-7/debian/control 2013-07-16 11:53:37 UTC (rev 17039) @@ -0,0 +1,52 @@ +Source: libitext-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Adriaan Peeters <[email protected]>, Torsten Werner <[email protected]>, + Emmanuel Bourg <[email protected]> +Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java (>= 1.48), + libbcmail-java, libbcpkix-java, libdom4j-java, libpdfrenderer-java, gcj-native-helper, + javahelper (>= 0.43) +Standards-Version: 3.9.4 +Homepage: http://www.lowagie.com/iText/ +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libitext-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libitext-java + +Package: libitext-java +Architecture: all +Depends: ${misc:Depends}, libbcprov-java (>= 1.48), ${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. + The iText classes are very useful for people who need to generate read-only, + platform independent documents containing text, lists, tables and images. + The library is especially useful in combination with Java(TM) + technology-based Servlets: The look and feel of HTML is browser dependent; + with iText and PDF you can control exactly how your servlet's output will look. + +Package: libitext-java-gcj +Architecture: any +Depends: libitext-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +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. + The iText classes are very useful for people who need to generate read-only, + platform independent documents containing text, lists, tables and images. + The library is especially useful in combination with Java(TM) + technology-based Servlets: The look and feel of HTML is browser dependent; + with iText and PDF you can control exactly how your servlet's output will look. + . + This package contains the natively compiled code for use by gij. + +Package: libitext-rtf-java +Architecture: all +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}, ${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. Deleted: tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_1.47_port.patch =================================================================== --- trunk/libitext-java/debian/patches/02_bouncycastle_1.47_port.patch 2013-07-15 17:30:14 UTC (rev 17033) +++ tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_1.47_port.patch 2013-07-16 11:53:37 UTC (rev 17039) @@ -1,206 +0,0 @@ -Description: Bouncy Castle 1.47 broke the binary compatibility with the previous - versions. iText 2.1.7 was developped for Bouncy Castle 1.38 and no longer works - with the recent versions. This patch addresses this issue and fixes the - compilation errors with Bouncy Castle 1.47 and later. - http://www.bouncycastle.org/wiki/display/JA1/Porting+from+earlier+BC+releases+to+1.47+and+later -Author: Emmanuel Bourg <[email protected]> -Origin: vendor -Forwarded: not-needed -Index: src/ant/.ant.properties -=================================================================== ---- src/ant/.ant.properties (revision 5738) -+++ src/ant/.ant.properties (working copy) -@@ -13,12 +13,12 @@ - jcommon.jar=${itext.lib}/jcommon.jar - servlet.jar=${itext.lib}/servlet.jar - --bc.jdk=jdk14 --bc.version=138 -+bc.jdk=jdk15on -+bc.version=1.48 - - lib.bcmail=bcmail-${bc.jdk}-${bc.version}.jar - lib.bcprov=bcprov-${bc.jdk}-${bc.version}.jar --lib.bctsp=bctsp-${bc.jdk}-${bc.version}.jar -+lib.bctsp=bcpkix-${bc.jdk}-${bc.version}.jar - lib.dom4j=pdf-renderer.jar - lib.pdf-renderer=dom4j-1.6.1.jar - -Index: src/core/com/lowagie/text/pdf/PdfPKCS7.java -=================================================================== ---- src/core/com/lowagie/text/pdf/PdfPKCS7.java (revision 5738) -+++ src/core/com/lowagie/text/pdf/PdfPKCS7.java (working copy) -@@ -77,21 +77,22 @@ - - import org.bouncycastle.asn1.ASN1Encodable; - import org.bouncycastle.asn1.ASN1EncodableVector; -+import org.bouncycastle.asn1.ASN1Encoding; - import org.bouncycastle.asn1.ASN1InputStream; - import org.bouncycastle.asn1.ASN1OutputStream; -+import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.ASN1Sequence; - import org.bouncycastle.asn1.ASN1Set; -+import org.bouncycastle.asn1.ASN1String; - import org.bouncycastle.asn1.ASN1TaggedObject; - import org.bouncycastle.asn1.DEREnumerated; - import org.bouncycastle.asn1.DERInteger; - import org.bouncycastle.asn1.DERNull; --import org.bouncycastle.asn1.DERObject; - import org.bouncycastle.asn1.DERObjectIdentifier; - import org.bouncycastle.asn1.DEROctetString; - import org.bouncycastle.asn1.DEROutputStream; - import org.bouncycastle.asn1.DERSequence; - import org.bouncycastle.asn1.DERSet; --import org.bouncycastle.asn1.DERString; - import org.bouncycastle.asn1.DERTaggedObject; - import org.bouncycastle.asn1.DERUTCTime; - import org.bouncycastle.asn1.cms.AttributeTable; -@@ -379,7 +380,7 @@ - // - // Basic checks to make sure it's a PKCS#7 SignedData Object - // -- DERObject pkcs; -+ ASN1Primitive pkcs; - - try { - pkcs = din.readObject(); -@@ -464,7 +465,7 @@ - if (signerInfo.getObjectAt(next) instanceof ASN1TaggedObject) { - ASN1TaggedObject tagsig = (ASN1TaggedObject)signerInfo.getObjectAt(next); - ASN1Set sseq = ASN1Set.getInstance(tagsig, false); -- sigAttr = sseq.getEncoded(ASN1Encodable.DER); -+ sigAttr = sseq.getEncoded(ASN1Encoding.DER); - - for (int k = 0; k < sseq.size(); ++k) { - ASN1Sequence seq2 = (ASN1Sequence)sseq.getObjectAt(k); -@@ -949,7 +950,7 @@ - */ - public static String getOCSPURL(X509Certificate certificate) throws CertificateParsingException { - try { -- DERObject obj = getExtensionValue(certificate, X509Extensions.AuthorityInfoAccess.getId()); -+ ASN1Primitive obj = getExtensionValue(certificate, X509Extensions.AuthorityInfoAccess.getId()); - if (obj == null) { - return null; - } -@@ -961,7 +962,7 @@ - continue; - } else { - if ((AccessDescription.getObjectAt(0) instanceof DERObjectIdentifier) && ((DERObjectIdentifier)AccessDescription.getObjectAt(0)).getId().equals("1.3.6.1.5.5.7.48.1")) { -- String AccessLocation = getStringFromGeneralName((DERObject)AccessDescription.getObjectAt(1)); -+ String AccessLocation = getStringFromGeneralName((ASN1Primitive)AccessDescription.getObjectAt(1)); - if ( AccessLocation == null ) { - return "" ; - } else { -@@ -999,7 +1000,7 @@ - return false; - } - -- private static DERObject getExtensionValue(X509Certificate cert, String oid) throws IOException { -+ private static ASN1Primitive getExtensionValue(X509Certificate cert, String oid) throws IOException { - byte[] bytes = cert.getExtensionValue(oid); - if (bytes == null) { - return null; -@@ -1010,7 +1011,7 @@ - return aIn.readObject(); - } - -- private static String getStringFromGeneralName(DERObject names) throws IOException { -+ private static String getStringFromGeneralName(ASN1Primitive names) throws IOException { - DERTaggedObject taggedObject = (DERTaggedObject) names ; - return new String(ASN1OctetString.getInstance(taggedObject, false).getOctets(), "ISO-8859-1"); - } -@@ -1020,11 +1021,11 @@ - * @param enc a TBSCertificate in a byte array - * @return a DERObject - */ -- private static DERObject getIssuer(byte[] enc) { -+ private static ASN1Primitive getIssuer(byte[] enc) { - try { - ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); - ASN1Sequence seq = (ASN1Sequence)in.readObject(); -- return (DERObject)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 3 : 2); -+ return (ASN1Primitive)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 3 : 2); - } - catch (IOException e) { - throw new ExceptionConverter(e); -@@ -1036,11 +1037,11 @@ - * @param enc A TBSCertificate in a byte array - * @return a DERObject - */ -- private static DERObject getSubject(byte[] enc) { -+ private static ASN1Primitive getSubject(byte[] enc) { - try { - ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); - ASN1Sequence seq = (ASN1Sequence)in.readObject(); -- return (DERObject)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 5 : 4); -+ return (ASN1Primitive)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 5 : 4); - } - catch (IOException e) { - throw new ExceptionConverter(e); -@@ -1340,7 +1341,7 @@ - */ - public byte[] getAuthenticatedAttributeBytes(byte secondDigest[], Calendar signingTime, byte[] ocsp) { - try { -- return getAuthenticatedAttributeSet(secondDigest, signingTime, ocsp).getEncoded(ASN1Encodable.DER); -+ return getAuthenticatedAttributeSet(secondDigest, signingTime, ocsp).getEncoded(ASN1Encoding.DER); - } - catch (Exception e) { - throw new ExceptionConverter(e); -@@ -1575,7 +1576,7 @@ - vs = new ArrayList(); - values.put(id, vs); - } -- vs.add(((DERString)s.getObjectAt(1)).getString()); -+ vs.add(((ASN1String)s.getObjectAt(1)).getString()); - } - } - } -Index: src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java -=================================================================== ---- src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java (revision 5738) -+++ src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java (working copy) -@@ -108,7 +108,7 @@ - import javax.crypto.SecretKey; - - import org.bouncycastle.asn1.ASN1InputStream; --import org.bouncycastle.asn1.DERObject; -+import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.DERObjectIdentifier; - import org.bouncycastle.asn1.DEROctetString; - import org.bouncycastle.asn1.DEROutputStream; -@@ -244,7 +244,7 @@ - pkcs7input[22] = two; - pkcs7input[23] = one; - -- DERObject obj = createDERForRecipient(pkcs7input, (X509Certificate)certificate); -+ ASN1Primitive obj = createDERForRecipient(pkcs7input, (X509Certificate)certificate); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - -@@ -276,7 +276,7 @@ - return EncodedRecipients; - } - -- private DERObject createDERForRecipient(byte[] in, X509Certificate cert) -+ private ASN1Primitive createDERForRecipient(byte[] in, X509Certificate cert) - throws IOException, - GeneralSecurityException - { -@@ -287,7 +287,7 @@ - AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters(); - ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1")); - ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream); -- DERObject derobject = asn1inputstream.readObject(); -+ ASN1Primitive derobject = asn1inputstream.readObject(); - KeyGenerator keygenerator = KeyGenerator.getInstance(s); - keygenerator.init(128); - SecretKey secretkey = keygenerator.generateKey(); -@@ -303,7 +303,7 @@ - EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, null); - ContentInfo contentinfo = - new ContentInfo(PKCSObjectIdentifiers.envelopedData, env); -- return contentinfo.getDERObject(); -+ return contentinfo.toASN1Primitive(); - } - - private KeyTransRecipientInfo computeRecipientInfo(X509Certificate x509certificate, byte[] abyte0) Copied: tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_compatibility.patch (from rev 17036, trunk/libitext-java/debian/patches/02_bouncycastle_compatibility.patch) =================================================================== --- tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_compatibility.patch (rev 0) +++ tags/libitext-java/2.1.7-7/debian/patches/02_bouncycastle_compatibility.patch 2013-07-16 11:53:37 UTC (rev 17039) @@ -0,0 +1,185 @@ +Description: iText 2.1.7 was developped for Bouncy Castle 1.38 and no longer works + with the recent versions. This patch addresses this issue and fixes the + compilation errors with Bouncy Castle 1.47 and later. + http://www.bouncycastle.org/wiki/display/JA1/Porting+from+earlier+BC+releases+to+1.47+and+later +Author: Emmanuel Bourg <[email protected]> +Origin: vendor +Forwarded: not-needed +--- a/core/com/lowagie/text/pdf/PdfPKCS7.java ++++ b/core/com/lowagie/text/pdf/PdfPKCS7.java +@@ -77,21 +77,22 @@ + + import org.bouncycastle.asn1.ASN1Encodable; + import org.bouncycastle.asn1.ASN1EncodableVector; ++import org.bouncycastle.asn1.ASN1Encoding; + import org.bouncycastle.asn1.ASN1InputStream; + import org.bouncycastle.asn1.ASN1OutputStream; ++import org.bouncycastle.asn1.ASN1Primitive; + import org.bouncycastle.asn1.ASN1Sequence; + import org.bouncycastle.asn1.ASN1Set; ++import org.bouncycastle.asn1.ASN1String; + import org.bouncycastle.asn1.ASN1TaggedObject; + import org.bouncycastle.asn1.DEREnumerated; + import org.bouncycastle.asn1.DERInteger; + import org.bouncycastle.asn1.DERNull; +-import org.bouncycastle.asn1.DERObject; + import org.bouncycastle.asn1.DERObjectIdentifier; + import org.bouncycastle.asn1.DEROctetString; + import org.bouncycastle.asn1.DEROutputStream; + import org.bouncycastle.asn1.DERSequence; + import org.bouncycastle.asn1.DERSet; +-import org.bouncycastle.asn1.DERString; + import org.bouncycastle.asn1.DERTaggedObject; + import org.bouncycastle.asn1.DERUTCTime; + import org.bouncycastle.asn1.cms.AttributeTable; +@@ -379,7 +380,7 @@ + // + // Basic checks to make sure it's a PKCS#7 SignedData Object + // +- DERObject pkcs; ++ ASN1Primitive pkcs; + + try { + pkcs = din.readObject(); +@@ -464,7 +465,7 @@ + if (signerInfo.getObjectAt(next) instanceof ASN1TaggedObject) { + ASN1TaggedObject tagsig = (ASN1TaggedObject)signerInfo.getObjectAt(next); + ASN1Set sseq = ASN1Set.getInstance(tagsig, false); +- sigAttr = sseq.getEncoded(ASN1Encodable.DER); ++ sigAttr = sseq.getEncoded(ASN1Encoding.DER); + + for (int k = 0; k < sseq.size(); ++k) { + ASN1Sequence seq2 = (ASN1Sequence)sseq.getObjectAt(k); +@@ -949,7 +950,7 @@ + */ + public static String getOCSPURL(X509Certificate certificate) throws CertificateParsingException { + try { +- DERObject obj = getExtensionValue(certificate, X509Extensions.AuthorityInfoAccess.getId()); ++ ASN1Primitive obj = getExtensionValue(certificate, X509Extensions.AuthorityInfoAccess.getId()); + if (obj == null) { + return null; + } +@@ -961,7 +962,7 @@ + continue; + } else { + if ((AccessDescription.getObjectAt(0) instanceof DERObjectIdentifier) && ((DERObjectIdentifier)AccessDescription.getObjectAt(0)).getId().equals("1.3.6.1.5.5.7.48.1")) { +- String AccessLocation = getStringFromGeneralName((DERObject)AccessDescription.getObjectAt(1)); ++ String AccessLocation = getStringFromGeneralName((ASN1Primitive)AccessDescription.getObjectAt(1)); + if ( AccessLocation == null ) { + return "" ; + } else { +@@ -999,7 +1000,7 @@ + return false; + } + +- private static DERObject getExtensionValue(X509Certificate cert, String oid) throws IOException { ++ private static ASN1Primitive getExtensionValue(X509Certificate cert, String oid) throws IOException { + byte[] bytes = cert.getExtensionValue(oid); + if (bytes == null) { + return null; +@@ -1010,7 +1011,7 @@ + return aIn.readObject(); + } + +- private static String getStringFromGeneralName(DERObject names) throws IOException { ++ private static String getStringFromGeneralName(ASN1Primitive names) throws IOException { + DERTaggedObject taggedObject = (DERTaggedObject) names ; + return new String(ASN1OctetString.getInstance(taggedObject, false).getOctets(), "ISO-8859-1"); + } +@@ -1020,11 +1021,11 @@ + * @param enc a TBSCertificate in a byte array + * @return a DERObject + */ +- private static DERObject getIssuer(byte[] enc) { ++ private static ASN1Primitive getIssuer(byte[] enc) { + try { + ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); + ASN1Sequence seq = (ASN1Sequence)in.readObject(); +- return (DERObject)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 3 : 2); ++ return (ASN1Primitive)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 3 : 2); + } + catch (IOException e) { + throw new ExceptionConverter(e); +@@ -1036,11 +1037,11 @@ + * @param enc A TBSCertificate in a byte array + * @return a DERObject + */ +- private static DERObject getSubject(byte[] enc) { ++ private static ASN1Primitive getSubject(byte[] enc) { + try { + ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(enc)); + ASN1Sequence seq = (ASN1Sequence)in.readObject(); +- return (DERObject)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 5 : 4); ++ return (ASN1Primitive)seq.getObjectAt(seq.getObjectAt(0) instanceof DERTaggedObject ? 5 : 4); + } + catch (IOException e) { + throw new ExceptionConverter(e); +@@ -1340,7 +1341,7 @@ + */ + public byte[] getAuthenticatedAttributeBytes(byte secondDigest[], Calendar signingTime, byte[] ocsp) { + try { +- return getAuthenticatedAttributeSet(secondDigest, signingTime, ocsp).getEncoded(ASN1Encodable.DER); ++ return getAuthenticatedAttributeSet(secondDigest, signingTime, ocsp).getEncoded(ASN1Encoding.DER); + } + catch (Exception e) { + throw new ExceptionConverter(e); +@@ -1575,7 +1576,7 @@ + vs = new ArrayList(); + values.put(id, vs); + } +- vs.add(((DERString)s.getObjectAt(1)).getString()); ++ vs.add(((ASN1String)s.getObjectAt(1)).getString()); + } + } + } +--- a/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java ++++ b/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java +@@ -108,7 +108,7 @@ + import javax.crypto.SecretKey; + + import org.bouncycastle.asn1.ASN1InputStream; +-import org.bouncycastle.asn1.DERObject; ++import org.bouncycastle.asn1.ASN1Primitive; + import org.bouncycastle.asn1.DERObjectIdentifier; + import org.bouncycastle.asn1.DEROctetString; + import org.bouncycastle.asn1.DEROutputStream; +@@ -244,7 +244,7 @@ + pkcs7input[22] = two; + pkcs7input[23] = one; + +- DERObject obj = createDERForRecipient(pkcs7input, (X509Certificate)certificate); ++ ASN1Primitive obj = createDERForRecipient(pkcs7input, (X509Certificate)certificate); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + +@@ -276,7 +276,7 @@ + return EncodedRecipients; + } + +- private DERObject createDERForRecipient(byte[] in, X509Certificate cert) ++ private ASN1Primitive createDERForRecipient(byte[] in, X509Certificate cert) + throws IOException, + GeneralSecurityException + { +@@ -287,7 +287,7 @@ + AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters(); + ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1")); + ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream); +- DERObject derobject = asn1inputstream.readObject(); ++ ASN1Primitive derobject = asn1inputstream.readObject(); + KeyGenerator keygenerator = KeyGenerator.getInstance(s); + keygenerator.init(128); + SecretKey secretkey = keygenerator.generateKey(); +@@ -300,10 +300,10 @@ + AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new DERObjectIdentifier(s), derobject); + EncryptedContentInfo encryptedcontentinfo = + new EncryptedContentInfo(PKCSObjectIdentifiers.data, algorithmidentifier, deroctetstring); +- EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, null); ++ EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, (org.bouncycastle.asn1.ASN1Set) null); + ContentInfo contentinfo = + new ContentInfo(PKCSObjectIdentifiers.envelopedData, env); +- return contentinfo.getDERObject(); ++ return contentinfo.toASN1Primitive(); + } + + private KeyTransRecipientInfo computeRecipientInfo(X509Certificate x509certificate, byte[] abyte0) Deleted: tags/libitext-java/2.1.7-7/debian/patches/series =================================================================== --- trunk/libitext-java/debian/patches/series 2013-07-15 17:30:14 UTC (rev 17033) +++ tags/libitext-java/2.1.7-7/debian/patches/series 2013-07-16 11:53:37 UTC (rev 17039) @@ -1,2 +0,0 @@ -01_allow_standard_input.patch -02_bouncycastle_1.47_port.patch Copied: tags/libitext-java/2.1.7-7/debian/patches/series (from rev 17036, trunk/libitext-java/debian/patches/series) =================================================================== --- tags/libitext-java/2.1.7-7/debian/patches/series (rev 0) +++ tags/libitext-java/2.1.7-7/debian/patches/series 2013-07-16 11:53:37 UTC (rev 17039) @@ -0,0 +1,2 @@ +01_allow_standard_input.patch +02_bouncycastle_compatibility.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
