This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tika.
commit f4ddb5263277d6d6aa4e5af8298c492032e07640 Author: Markus Koschany <[email protected]> Date: Mon Nov 30 19:38:37 2015 +0000 Rename patches --- debian/patches/01-jar-packaging.patch | 6 +++++- debian/patches/{MP4Parser.patch => 02-ignore-mp4parser.patch} | 2 ++ debian/patches/{netcdf.patch => 03-ignore-netcdf.patch} | 2 ++ debian/patches/{osgi.patch => 05-osgi-compatibility.patch} | 2 ++ ...ser-dependencies.patch => 06-optional-parser-dependencies.patch} | 0 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/patches/01-jar-packaging.patch b/debian/patches/01-jar-packaging.patch index 38ccbaa..900511c 100644 --- a/debian/patches/01-jar-packaging.patch +++ b/debian/patches/01-jar-packaging.patch @@ -1,7 +1,11 @@ -From: Debian Java Maintainers <[email protected]> +From: Emmanuel Bourg <[email protected]> Date: Mon, 30 Nov 2015 15:50:06 +0000 Subject: jar-packaging +Change the Maven packaging from bundle to jar to avoid build issues with +maven-debian-helper. + +Forwarded: not-needed --- tika-core/pom.xml | 2 +- tika-parsers/pom.xml | 2 +- diff --git a/debian/patches/MP4Parser.patch b/debian/patches/02-ignore-mp4parser.patch similarity index 99% rename from debian/patches/MP4Parser.patch rename to debian/patches/02-ignore-mp4parser.patch index 3998d88..7c691bf 100644 --- a/debian/patches/MP4Parser.patch +++ b/debian/patches/02-ignore-mp4parser.patch @@ -2,6 +2,8 @@ From: Markus Koschany <[email protected]> Date: Mon, 30 Nov 2015 15:50:18 +0000 Subject: MP4Parser +Remove the classes using the mp4parser library which isn't in Debian yet +Forwarded: not-needed --- .../java/org/apache/tika/parser/mp4/MP4Parser.java | 325 --------------------- 1 file changed, 325 deletions(-) diff --git a/debian/patches/netcdf.patch b/debian/patches/03-ignore-netcdf.patch similarity index 99% rename from debian/patches/netcdf.patch rename to debian/patches/03-ignore-netcdf.patch index 2fe84d6..7497922 100644 --- a/debian/patches/netcdf.patch +++ b/debian/patches/03-ignore-netcdf.patch @@ -2,6 +2,8 @@ From: Markus Koschany <[email protected]> Date: Mon, 30 Nov 2015 15:53:57 +0000 Subject: netcdf +Remove the classes using the netcdf library which isn't in Debian yet. +Forwarded: not-needed --- .../java/org/apache/tika/parser/hdf/HDFParser.java | 122 ----------------- .../apache/tika/parser/netcdf/NetCDFParser.java | 144 --------------------- diff --git a/debian/patches/osgi.patch b/debian/patches/05-osgi-compatibility.patch similarity index 94% rename from debian/patches/osgi.patch rename to debian/patches/05-osgi-compatibility.patch index 15a86d9..2ab5b58 100644 --- a/debian/patches/osgi.patch +++ b/debian/patches/05-osgi-compatibility.patch @@ -2,6 +2,8 @@ From: Markus Koschany <[email protected]> Date: Mon, 30 Nov 2015 15:55:24 +0000 Subject: osgi +Ensure the compatibility with the version of osgi-core in Debian +Forwarded: not-needed --- .../src/main/java/org/apache/tika/parser/internal/Activator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/optional-parser-dependencies.patch b/debian/patches/06-optional-parser-dependencies.patch similarity index 100% rename from debian/patches/optional-parser-dependencies.patch rename to debian/patches/06-optional-parser-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tika.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
