Author: nd-guest
Date: 2007-12-09 15:17:19 +0000 (Sun, 09 Dec 2007)
New Revision: 4981
Added:
trunk/libmetadata-extractor-java/debian/README.Debian
trunk/libmetadata-extractor-java/debian/patches/00list
trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch
trunk/libmetadata-extractor-java/debian/patches/20nosun.dpatch
Modified:
trunk/libmetadata-extractor-java/debian/changelog
trunk/libmetadata-extractor-java/debian/control
trunk/libmetadata-extractor-java/debian/rules
Log:
* Added patch to build with gcj.
* Move package to main.
Added: trunk/libmetadata-extractor-java/debian/README.Debian
===================================================================
--- trunk/libmetadata-extractor-java/debian/README.Debian
(rev 0)
+++ trunk/libmetadata-extractor-java/debian/README.Debian 2007-12-09
15:17:19 UTC (rev 4981)
@@ -0,0 +1,8 @@
+libmetadata-extractor-java for Debian
+-------------------------------------
+
+The method public static Metadata readMetadata(JPEGDecodeParam decodeParam)
+in class com.drew.imaging.jpeg.JpegMetadataReader has been removed from the
+library to not depend on proprietary class libraries.
+
+ -- Andreas Putzo <[EMAIL PROTECTED]> Sun, 09 Dec 2007 14:08:58 +0000
Modified: trunk/libmetadata-extractor-java/debian/changelog
===================================================================
--- trunk/libmetadata-extractor-java/debian/changelog 2007-12-09 09:56:19 UTC
(rev 4980)
+++ trunk/libmetadata-extractor-java/debian/changelog 2007-12-09 15:17:19 UTC
(rev 4981)
@@ -1,3 +1,20 @@
+libmetadata-extractor-java (2.3.1+nosun-1) unstable; urgency=low
+
+ * Add 20nosun.dpatch provided by Gabriel Ebner to remove
+ all references to the com.sun classes.
+ Changed upstream_version to re-upload orig.tar.gz.
+ * debian/rules:
+ - Use dpatch instead of CDBS simple-patchsys.
+ - Build with java-gcj.
+ * debian/control:
+ - Added dpatch to build-deps.
+ - Replaced sun's java with java-gcj-compat in dep/build-dep.
+ - Add new Homepage field and remove homepage from long description.
+ - Move package to main. Sun's java is no longer needed.
+ - Bumped Standards-Version to 3.7.3.
+
+ -- Andreas Putzo <[EMAIL PROTECTED]> Sun, 09 Dec 2007 14:02:32 +0000
+
libmetadata-extractor-java (2.3.1-2) unstable; urgency=low
* Added debian/ant.properties to set javac's source/target property to 1.3.
Modified: trunk/libmetadata-extractor-java/debian/control
===================================================================
--- trunk/libmetadata-extractor-java/debian/control 2007-12-09 09:56:19 UTC
(rev 4980)
+++ trunk/libmetadata-extractor-java/debian/control 2007-12-09 15:17:19 UTC
(rev 4981)
@@ -1,32 +1,29 @@
Source: libmetadata-extractor-java
-Section: contrib/libs
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Andreas Putzo <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 5), sun-java6-jdk, ant, junit
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 5), dpatch, java-gcj-compat-dev, ant, junit
+Standards-Version: 3.7.3
+Homepage: http://www.drewnoakes.com/code/exif/
Package: libmetadata-extractor-java
-Section: contrib/libs
+Section: libs
Architecture: all
-Depends: sun-java6-jre | java2-runtime
+Depends: java-gcj-compat | java2-runtime
Suggests: libmetadata-extractor-java-doc
Description: JPEG metadata extraction framework
Java based metadata extraction library for JPEG images
with support for Exif and Iptc metadata segments, including
manufacturer specific metadata of several digital camera models.
- .
- Homepage: http://www.drewnoakes.com/code/exif/
Package: libmetadata-extractor-java-doc
Recommends: libmetadata-extractor-java
Architecture: all
-Section: contrib/doc
+Section: doc
Description: Documentation for the JPEG metadata extraction framework
Java based metadata extraction library for JPEG images
with support for Exif and Iptc metadata segments, including
manufacturer specific metadata of several digital camera models.
.
This package provides the Javadoc API documentation.
- .
- Homepage: http://www.drewnoakes.com/code/exif/
Added: trunk/libmetadata-extractor-java/debian/patches/00list
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/00list
(rev 0)
+++ trunk/libmetadata-extractor-java/debian/patches/00list 2007-12-09
15:17:19 UTC (rev 4981)
@@ -0,0 +1,2 @@
+10buildxml
+20nosun
Copied: trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch (from
rev 3919, trunk/libmetadata-extractor-java/debian/patches/10buildxml.patch)
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch
(rev 0)
+++ trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch
2007-12-09 15:17:19 UTC (rev 4981)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10buildxml.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## DP: Adjust build.xml file.
+
[EMAIL PROTECTED]@
+diff -urNad libmetadata-extractor-java-2.3.1~/build.xml
libmetadata-extractor-java-2.3.1/build.xml
+--- libmetadata-extractor-java-2.3.1~/build.xml 2007-11-12
20:52:12.000000000 +0000
++++ libmetadata-extractor-java-2.3.1/build.xml 2007-11-12 21:17:41.000000000
+0000
+@@ -7,8 +7,8 @@
+ <property name="dist" location="Releases"/>
+ <property name="build" value="Build"/>
+ <property name="src" value="src"/>
+- <property name="javadoc" value="javadoc"/>
+- <property name="lib" value="Libraries"/>
++ <property name="javadoc" value="api"/>
++ <property name="lib" value="/usr/share/ant/lib"/>
+ <property name="verbose" value="true"/>
+ <property name="debug" value="off"/>
+ <property name="version" value="2.3.1"/>
+@@ -28,7 +28,7 @@
+ verbose="${verbose}"/>
+ </target>
+
+- <target name="dist-binaries" depends="clean, compile, test"
description="generate binary distribution">
++ <target name="dist-binaries" depends="clean, compile, javadoc"
description="generate binary distribution">
+ <jar destfile="${dist}/metadata-extractor-${version}.jar"
update="false">
+ <manifest>
+ <attribute name="Main-Class"
value="com.drew.imaging.jpeg.JpegMetadataReader"/>
Added: trunk/libmetadata-extractor-java/debian/patches/20nosun.dpatch
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/20nosun.dpatch
(rev 0)
+++ trunk/libmetadata-extractor-java/debian/patches/20nosun.dpatch
2007-12-09 15:17:19 UTC (rev 4981)
@@ -0,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20nosun.dpatch by Gabriel Ebner <[EMAIL PROTECTED]>
+##
+## DP: Remove all references to the com.sun.image.codec.jpeg package.
+
[EMAIL PROTECTED]@
+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)
Property changes on:
trunk/libmetadata-extractor-java/debian/patches/20nosun.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/libmetadata-extractor-java/debian/rules
===================================================================
--- trunk/libmetadata-extractor-java/debian/rules 2007-12-09 09:56:19 UTC
(rev 4980)
+++ trunk/libmetadata-extractor-java/debian/rules 2007-12-09 15:17:19 UTC
(rev 4981)
@@ -2,10 +2,10 @@
# debian/rules file for libmetadata-extractor-java (uses cdbs)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-6-sun
+JAVA_HOME := /usr/lib/jvm/java-gcj/
ANT_HOME := /usr/share/ant
DEB_ANT_BUILD_TARGET := dist-binaries
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
