[libmetadata-extractor-java] 08/22: Drop all patches.
Markus Koschany
apo at moszumanska.debian.org
Fri Jun 30 22:13:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libmetadata-extractor-java.
commit 26b5f2535772ec54efd8321d7762206a9801f059
Author: Markus Koschany <apo at debian.org>
Date: Fri Jun 30 21:38:55 2017 +0200
Drop all patches.
---
debian/patches/01_build.patch | 43 --------------------
debian/patches/20nosun.dpatch | 91 -------------------------------------------
debian/patches/series | 1 -
3 files changed, 135 deletions(-)
diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch
deleted file mode 100644
index 515d6ef..0000000
--- a/debian/patches/01_build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Tweaks to build the project
-Author: Emmanuel Bourg <ebourg at apache.org>
---- a/build.xml
-+++ b/build.xml
-@@ -130,7 +130,6 @@
- <file file="LICENSE-2.0.txt" />
- <file file="README.txt" />
- </zip>
-- <delete file="${bin-jar}" />
- </target>
-
- <target name="dist-source" depends="clean, compile, test" description="generate source distribution">
-@@ -151,6 +150,7 @@
- <delete verbose="${verbose}" dir="${javadoc}" />
- <javadoc
- destdir="${javadoc}"
-+ encoding="UTF-8"
- defaultexcludes="yes"
- author="true"
- version="true"
-@@ -162,12 +162,7 @@
- <!-- be sure to only use single quotes in the CDATA sections below -->
- <!-- TODO include <link rel='shortcut icon' href='https://raw.githubusercontent.com/drewnoakes/metadata-extractor/master/Resources/metadata-extractor.ico' /> -->
- <header><![CDATA[<a href='https://drewnoakes.com/code/exif/' title='Go to the project home page.'><img src='https://raw.githubusercontent.com/drewnoakes/metadata-extractor/master/Resources/metadata-extractor-logo-131x30.png' border="0" alt='Metadata Extractor Logo'></a>]]></header>
-- <bottom><![CDATA[<i>Copyright © 2002-2015 Drew Noakes. All Rights Reserved.</i>
--<script src='http://www.google-analytics.com/urchin.js' type='text/javascript'></script>
--<script type='text/javascript'>
--_uacct = 'UA-936661-1';
--urchinTracker();
--</script>]]></bottom>
-+ <bottom><![CDATA[<i>Copyright © 2002-2015 Drew Noakes. All Rights Reserved.</i>]]></bottom>
-
- <!-- Only build Java -->
- <packageset dir="${src}" defaultexcludes="yes">
-@@ -181,6 +176,8 @@
- </fileset>
- </classpath>
-
-+ <link href="/usr/share/doc/default-jdk-doc/api"/>
-+
- </javadoc>
- <copy file="Resources/javadoc-stylesheet.css" tofile="${javadoc}/stylesheet.css" overwrite="yes" />
- </target>
diff --git a/debian/patches/20nosun.dpatch b/debian/patches/20nosun.dpatch
deleted file mode 100755
index 90de3c0..0000000
--- a/debian/patches/20nosun.dpatch
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20nosun.dpatch by Gabriel Ebner <ge at gabrielebner.at>
-##
-## DP: Remove all references to the com.sun.image.codec.jpeg package.
-
- at DPATCH@
-diff -urNad libmetadata-extractor-java-2.3.1~/src/com/drew/imaging/jpeg/JpegMetadataReader.java libmetadata-extractor-java-2.3.1/src/com/drew/imaging/jpeg/JpegMetadataReader.java
---- libmetadata-extractor-java-2.3.1~/src/com/drew/imaging/jpeg/JpegMetadataReader.java 2007-11-12 20:52:12.000000000 +0000
-+++ libmetadata-extractor-java-2.3.1/src/com/drew/imaging/jpeg/JpegMetadataReader.java 2007-11-12 21:01:55.000000000 +0000
-@@ -25,7 +25,6 @@
- import com.drew.metadata.iptc.IptcReader;
- import com.drew.metadata.jpeg.JpegCommentReader;
- import com.drew.metadata.jpeg.JpegReader;
--import com.sun.image.codec.jpeg.JPEGDecodeParam;
-
- import java.io.File;
- import java.io.IOException;
-@@ -89,36 +88,6 @@
- return metadata;
- }
-
-- public static Metadata readMetadata(JPEGDecodeParam decodeParam)
-- {
-- final Metadata metadata = new Metadata();
--
-- /* We should only really be seeing Exif in _data[0]... the 2D array exists
-- * because markers can theoretically appear multiple times in the file.
-- */
-- // TODO test this method
-- byte[][] exifSegment = decodeParam.getMarkerData(JPEGDecodeParam.APP1_MARKER);
-- if (exifSegment != null && exifSegment[0].length>0) {
-- new ExifReader(exifSegment[0]).extract(metadata);
-- }
--
-- // similarly, use only the first IPTC segment
-- byte[][] iptcSegment = decodeParam.getMarkerData(JPEGDecodeParam.APPD_MARKER);
-- if (iptcSegment != null && iptcSegment[0].length>0) {
-- new IptcReader(iptcSegment[0]).extract(metadata);
-- }
--
-- // NOTE: Unable to utilise JpegReader for the SOF0 frame here, as the decodeParam doesn't contain the byte[]
--
-- // similarly, use only the first Jpeg Comment segment
-- byte[][] jpegCommentSegment = decodeParam.getMarkerData(JPEGDecodeParam.COMMENT_MARKER);
-- if (jpegCommentSegment != null && jpegCommentSegment[0].length>0) {
-- new JpegCommentReader(jpegCommentSegment[0]).extract(metadata);
-- }
--
-- return metadata;
-- }
--
- private JpegMetadataReader()
- {
- }
-diff -urNad libmetadata-extractor-java-2.3.1~/src/com/drew/metadata/SampleUsage.java libmetadata-extractor-java-2.3.1/src/com/drew/metadata/SampleUsage.java
---- libmetadata-extractor-java-2.3.1~/src/com/drew/metadata/SampleUsage.java 2007-11-12 20:52:12.000000000 +0000
-+++ libmetadata-extractor-java-2.3.1/src/com/drew/metadata/SampleUsage.java 2007-11-12 21:01:55.000000000 +0000
-@@ -21,9 +21,6 @@
- import com.drew.imaging.jpeg.JpegSegmentReader;
- import com.drew.metadata.exif.ExifReader;
- import com.drew.metadata.iptc.IptcReader;
--import com.sun.image.codec.jpeg.JPEGCodec;
--import com.sun.image.codec.jpeg.JPEGDecodeParam;
--import com.sun.image.codec.jpeg.JPEGImageDecoder;
-
- import java.awt.image.BufferedImage;
- import java.io.File;
-@@ -87,23 +84,6 @@
- } catch (JpegProcessingException jpe) {
- System.err.println("error 3a");
- }
--
-- // Approach 4
-- // This approach is the slowest, because it decodes the Jpeg image. Of
-- // course you now have a decoded image to play with. In some instances
-- // this will be most appropriate.
-- try {
-- JPEGImageDecoder jpegDecoder = JPEGCodec.createJPEGDecoder(new FileInputStream(jpegFile));
-- BufferedImage image = jpegDecoder.decodeAsBufferedImage();
-- // now you can use the image
-- JPEGDecodeParam decodeParam = jpegDecoder.getJPEGDecodeParam();
-- Metadata metadata = JpegMetadataReader.readMetadata(decodeParam);
-- printImageTags(4, metadata);
-- } catch (FileNotFoundException e) {
-- System.err.println("error 4a");
-- } catch (IOException e) {
-- System.err.println("error 4b");
-- }
- }
-
- private void printImageTags(int approachCount, Metadata metadata)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 50bb18b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libmetadata-extractor-java.git
More information about the pkg-java-commits
mailing list