[libpdfbox-java] 15/21: Drop all unused patches.
Markus Koschany
apo at moszumanska.debian.org
Fri Jun 30 13:54:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libpdfbox-java.
commit 40b0045713fd11ed5c3334aebd7e755ac9b9780d
Author: Markus Koschany <apo at debian.org>
Date: Thu Jun 29 23:36:44 2017 +0200
Drop all unused patches.
---
debian/patches/05_bc1.51.patch | 44 --------------
debian/patches/build-subproject-docs.patch | 79 -------------------------
debian/patches/build.xml.patch | 94 ------------------------------
debian/patches/reproducible-build.patch | 40 -------------
debian/patches/series | 0
5 files changed, 257 deletions(-)
diff --git a/debian/patches/05_bc1.51.patch b/debian/patches/05_bc1.51.patch
deleted file mode 100644
index 7134e8b..0000000
--- a/debian/patches/05_bc1.51.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: patch for bouncycastle 1.51
-Forwarded: no
-Author: tony mancill <tmancill at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2016-01-23
-
---- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
-+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
-@@ -27,6 +27,7 @@
- import java.security.MessageDigest;
- import java.security.NoSuchAlgorithmException;
- import java.security.NoSuchProviderException;
-+import java.security.PrivateKey;
- import java.security.SecureRandom;
- import java.security.cert.X509Certificate;
- import java.util.Iterator;
-@@ -56,6 +57,7 @@
- import org.bouncycastle.cms.CMSEnvelopedData;
- import org.bouncycastle.cms.CMSException;
- import org.bouncycastle.cms.RecipientInformation;
-+import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
- import org.apache.pdfbox.cos.COSArray;
- import org.apache.pdfbox.cos.COSString;
- import org.apache.pdfbox.exceptions.CryptographyException;
-@@ -185,7 +187,7 @@
- if (ri.getRID().match(material.getCertificate()) && !foundRecipient)
- {
- foundRecipient = true;
-- envelopedData = ri.getContent(material.getPrivateKey(), "BC");
-+ envelopedData = ri.getContent(new JceKeyTransEnvelopedRecipient((PrivateKey) material.getPrivateKey()).setProvider("BC"));
- break;
- }
- }
-@@ -239,10 +241,6 @@
- {
- throw new CryptographyException(e);
- }
-- catch (NoSuchProviderException e)
-- {
-- throw new CryptographyException(e);
-- }
- catch (NoSuchAlgorithmException e)
- {
- throw new CryptographyException(e);
diff --git a/debian/patches/build-subproject-docs.patch b/debian/patches/build-subproject-docs.patch
deleted file mode 100644
index 50ddbb3..0000000
--- a/debian/patches/build-subproject-docs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: build javadocs for JempBox and FontBox
-Origin: vendor
-Forwarded: no
-Author: tony mancill <tmancill at debian.org>
-Last-Update: 2014-06-23
-
---- a/pdfbox/build.xml
-+++ b/pdfbox/build.xml
-@@ -441,7 +441,7 @@
-
- <!-- We use Maven to create the release packages. Keep this target for -->
- <!-- now for backwards compatibility with old build scripts and habits -->
-- <target name="dist" depends="pdfbox.clean,pdfbox.package,javadoc,build.NET,checkstyle"/>
-+ <target name="dist" depends="pdfbox.clean,pdfbox.package,pdfbox.javadoc,build.NET,checkstyle"/>
-
- <target name="clean" depends="fontbox.clean,jempbox.clean,pdfbox.clean"/>
-
-@@ -840,7 +840,7 @@
- </exec>
- </target>
-
-- <target name="javadoc" depends="pdfbox.compile" description="Create Javadocs">
-+ <target name="pdfbox.javadoc" depends="pdfbox.compile" description="Create Javadocs">
- <javadoc packagenames="org.*"
- sourcepath="${pdfbox.src.dir}"
- destdir="${pdfbox.target.dir}/javadoc"
-@@ -863,4 +863,52 @@
- </replaceregexp>
- </target>
-
-+ <target name="fontbox.javadoc" depends="fontbox.compile" description="Create Javadocs">
-+ <property name="fontbox.release.name" value="${project.name}-${project.version}" />
-+ <javadoc packagenames="org.*"
-+ sourcepath="${fontbox.src.dir}"
-+ destdir="${fontbox.target.dir}/javadoc"
-+ author="true"
-+ version="true"
-+ use="true"
-+ windowtitle="${fontbox.release.name} API"
-+ doctitle="${project.name}"
-+ verbose="no"
-+ classpathref="fontbox.build.classpath"
-+ encoding="ISO-8859-1"
-+ breakiterator="yes">
-+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
-+ </javadoc>
-+ <!-- PDFBOX-461: Disable javadoc creation timestamp -->
-+ <replaceregexp match="<!-- Generated by javadoc .* -->"
-+ replace="<!-- Generated by javadoc -->"
-+ flags="g" byline="true">
-+ <fileset dir="${fontbox.target.dir}/javadoc" includes="**/*.html" />
-+ </replaceregexp>
-+ </target>
-+
-+ <target name="jempbox.javadoc" depends="jempbox.compile" description="Create Javadocs">
-+ <property name="jempbox.release.name" value="${project.name}-${project.version}" />
-+ <javadoc packagenames="org.*"
-+ sourcepath="${jempbox.src.dir}"
-+ destdir="${jempbox.target.dir}/javadoc"
-+ author="true"
-+ version="true"
-+ use="true"
-+ windowtitle="${jempbox.release.name} API"
-+ doctitle="${project.name}"
-+ verbose="no"
-+ classpathref="jempbox.build.classpath"
-+ encoding="ISO-8859-1"
-+ breakiterator="yes">
-+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
-+ </javadoc>
-+ <!-- PDFBOX-461: Disable javadoc creation timestamp -->
-+ <replaceregexp match="<!-- Generated by javadoc .* -->"
-+ replace="<!-- Generated by javadoc -->"
-+ flags="g" byline="true">
-+ <fileset dir="${jempbox.target.dir}/javadoc" includes="**/*.html" />
-+ </replaceregexp>
-+ </target>
-+
- </project>
diff --git a/debian/patches/build.xml.patch b/debian/patches/build.xml.patch
deleted file mode 100644
index 2e74bf2..0000000
--- a/debian/patches/build.xml.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: adjust for Debian:
- - use Debian packages for building
- - remove the test classes from the jars
- - fix a variable
-Origin: vendor
-Forwarded: not-needed
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2016-01-23
-
---- a/pdfbox/build.xml
-+++ b/pdfbox/build.xml
-@@ -24,8 +24,8 @@
- <property name="build.compiler" value="modern" />
-
- <property name="download.dir" value="download" />
-- <property name="jar.dir" value="external" />
-- <property name="tool.dir" value="tools" />
-+ <property name="jar.dir" value="/usr/share/java" />
-+ <property name="tool.dir" value="/usr/share/java" />
- <property name="bin.dir" value="bin" />
-
- <property name="project.version" value="1.8.11" />
-@@ -64,23 +64,23 @@
- <property name="maven.repo1" value="http://repo1.maven.org/maven2" />
- <property name="maven.repo2" value="http://repo2.maven.org/maven2" />
-
-- <property name="bcprov.name" value="bcprov-jdk15-1.44" />
-+ <property name="bcprov.name" value="bcprov" />
- <property name="bcprov.url" value="${maven.repo2}/org/bouncycastle/bcprov-jdk15/1.44/${bcprov.name}.jar" />
- <property name="bcprov.jar" value="${jar.dir}/${bcprov.name}.jar" />
-
-- <property name="bcmail.name" value="bcmail-jdk15-1.44" />
-+ <property name="bcmail.name" value="bcmail" />
- <property name="bcmail.url" value="${maven.repo2}/org/bouncycastle/bcmail-jdk15/1.44/${bcmail.name}.jar" />
- <property name="bcmail.jar" value="${jar.dir}/${bcmail.name}.jar" />
-
-- <property name="junit.name" value="junit-4.8.1" />
-+ <property name="junit.name" value="junit4" />
- <property name="junit.url" value="${maven.repo2}/junit/junit/4.8.1/${junit.name}.jar" />
- <property name="junit.jar" value="${jar.dir}/${junit.name}.jar" />
-
-- <property name="logging.name" value="commons-logging-1.1.1" />
-+ <property name="logging.name" value="commons-logging" />
- <property name="logging.url" value="${maven.repo1}/commons-logging/commons-logging/1.1.1/${logging.name}.jar" />
- <property name="logging.jar" value="${jar.dir}/${logging.name}.jar" />
-
-- <property name="icu4j.name" value="icu4j-3.8" />
-+ <property name="icu4j.name" value="icu4j" />
- <property name="icu4j.url" value="${maven.repo1}/com/ibm/icu/icu4j/3.8/${icu4j.name}.jar" />
- <property name="icu4j.jar" value="${jar.dir}/${icu4j.name}.jar" />
-
-@@ -177,9 +177,11 @@
- <javac srcdir="${pdfbox.src.dir}" destdir="${pdfbox.dest.dir}"
- target="1.5" source="1.5" debug="on" deprecation="on"
- classpathref="pdfbox.build.classpath" encoding="ISO-8859-1"/>
-+<!--
- <javac srcdir="${pdfbox.test.dir}" destdir="${pdfbox.dest.dir}"
- target="1.5" source="1.5" debug="on" deprecation="on"
- classpathref="pdfbox.build.classpath" encoding="ISO-8859-1"/>
-+-->
- </target>
-
- <target name="fontbox.compile" depends="fontbox.init"
-@@ -188,9 +190,11 @@
- <javac srcdir="${fontbox.src.dir}" destdir="${fontbox.dest.dir}"
- target="1.5" source="1.5" debug="on" deprecation="on"
- classpathref="fontbox.build.classpath" encoding="ISO-8859-1"/>
-+<!--
- <javac srcdir="${fontbox.test.dir}" destdir="${fontbox.dest.dir}"
- target="1.5" source="1.5" debug="on" deprecation="on"
- classpathref="fontbox.build.classpath" encoding="ISO-8859-1"/>
-+-->
- </target>
-
- <target name="jempbox.compile" depends="jempbox.init"
-@@ -199,15 +203,17 @@
- <javac srcdir="${jempbox.src.dir}" destdir="${jempbox.dest.dir}"
- target="1.5" source="1.5" debug="on" deprecation="on"
- classpathref="jempbox.build.classpath" encoding="ISO-8859-1"/>
-+<!--
- <javac srcdir="${jempbox.test.dir}" destdir="${jempbox.dest.dir}"
- target="1.5" source="1.5" debug="on" deprecation="on"
- classpathref="jempbox.build.classpath" encoding="ISO-8859-1"/>
-+-->
- </target>
-
- <target name="test" depends="testextract,test-junit,testimage" description="Run all the junit tests"/>
-
- <target name="find.adobefiles">
-- <available property="adobefiles.found" file="${dest.dir}/org/apache/pdfbox/resources/cmap"/>
-+ <available property="adobefiles.found" file="${pdfbox.dest.dir}/org/apache/pdfbox/resources/cmap"/>
- </target>
-
- <target name="get.adobefiles"
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
deleted file mode 100644
index 38edb88..0000000
--- a/debian/patches/reproducible-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Make the build reproducible
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pdfbox/build.xml
-+++ b/pdfbox/build.xml
-@@ -393,9 +393,7 @@
- </target>
-
- <target name="pdfbox.package" depends="get.externallibs.pdfbox,pdfbox.compile" description="Package pdfbox into a jar file">
-- <propertyfile file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">
-- <entry key="pdfbox.version" value="${pdfbox.release.name}"/>
-- </propertyfile>
-+ <echo file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">pdfbox.version=${pdfbox.release.name}</echo>
-
- <jar jarfile="./${pdfbox.target.dir}/${pdfbox.release.name}.jar">
- <fileset dir="${pdfbox.dest.dir}"/>
-@@ -852,6 +850,7 @@
- verbose="no"
- classpathref="pdfbox.build.classpath"
- encoding="ISO-8859-1"
-+ locale="en"
- breakiterator="yes">
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- </javadoc>
-@@ -876,6 +875,7 @@
- verbose="no"
- classpathref="fontbox.build.classpath"
- encoding="ISO-8859-1"
-+ locale="en"
- breakiterator="yes">
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- </javadoc>
-@@ -900,6 +900,7 @@
- verbose="no"
- classpathref="jempbox.build.classpath"
- encoding="ISO-8859-1"
-+ locale="en"
- breakiterator="yes">
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- </javadoc>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpdfbox-java.git
More information about the pkg-java-commits
mailing list