[SCM] libpdfbox-java packaging branch, master, updated. debian/1.8.2+dfsg-1-2-gb86ca8a

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit d5b28a28c19138f407265187dbb4019d2ca96f31
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 22 11:24:08 2013 +0200

    Updated bc-1.47.patch to also work with Bouncy Castle 1.49

diff --git a/debian/patches/bc-1.47.patch b/debian/patches/bc-1.47.patch
index a2a0834..1e5fe11 100644
--- a/debian/patches/bc-1.47.patch
+++ b/debian/patches/bc-1.47.patch
@@ -1,7 +1,8 @@
 Description: adjust to Bouncy Castle >= 1.47
  cf. http://www.bouncycastle.org/wiki/display/JA1/Porting+from+earlier+BC+releases+to+1.47+and+later
 Origin: vendor
-Forwarded: no
+Bug: https://issues.apache.org/jira/browse/PDFBOX-1587
+ https://issues.apache.org/jira/browse/PDFBOX-1669
 Author: gregor herrmann <gregoa at debian.org>
 Last-Update: 2013-06-02
 
@@ -53,7 +54,8 @@ Last-Update: 2013-06-02
 +        AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new ASN1ObjectIdentifier(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, null);
++        EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, (org.bouncycastle.asn1.ASN1Set) null);
          ContentInfo contentinfo =
              new ContentInfo(PKCSObjectIdentifiers.envelopedData, env);
 -        return contentinfo.getDERObject();

-- 
libpdfbox-java packaging