[pkg-java] r17058 - in trunk/libmetadata-extractor-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Tue Jul 23 22:13:38 UTC 2013
Author: ebourg-guest
Date: 2013-07-23 22:13:38 +0000 (Tue, 23 Jul 2013)
New Revision: 17058
Added:
trunk/libmetadata-extractor-java/debian/libmetadata-extractor-java.classpath
trunk/libmetadata-extractor-java/debian/maven.ignoreRules
trunk/libmetadata-extractor-java/debian/maven.rules
trunk/libmetadata-extractor-java/debian/metadata-extractor.pom
trunk/libmetadata-extractor-java/debian/patches/01_build.patch
Removed:
trunk/libmetadata-extractor-java/debian/README.Debian
trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch
Modified:
trunk/libmetadata-extractor-java/debian/ant.properties
trunk/libmetadata-extractor-java/debian/changelog
trunk/libmetadata-extractor-java/debian/control
trunk/libmetadata-extractor-java/debian/copyright
trunk/libmetadata-extractor-java/debian/patches/series
trunk/libmetadata-extractor-java/debian/rules
Log:
New upstream release (2.6.4)
- Removed 20nosun.dpatch (applied upstream)
- Added a patch to set the encoding of the source files
Install the Maven pom and the jar into /usr/share/maven-repo
Linked the javadoc with the default-jdk-doc
Enabled the debugging info in the compiled classes
Removed 10buildxml.dpatch to enable the unit tests
debian/rules:
- Added a get-orig-source target to build the source tarball
- Added a get-orig-pom target to fetch the Maven pom
debian/control: libmetadata-extractor-java-doc suggests libmetadata-extractor-java but no longer recommends it
debian/copyright: Updated to the Copyright Format 1.0
Deleted: trunk/libmetadata-extractor-java/debian/README.Debian
===================================================================
--- trunk/libmetadata-extractor-java/debian/README.Debian 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/README.Debian 2013-07-23 22:13:38 UTC (rev 17058)
@@ -1,8 +0,0 @@
-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 <andreas at putzo.net> Sun, 09 Dec 2007 14:08:58 +0000
Modified: trunk/libmetadata-extractor-java/debian/ant.properties
===================================================================
--- trunk/libmetadata-extractor-java/debian/ant.properties 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/ant.properties 2013-07-23 22:13:38 UTC (rev 17058)
@@ -1,2 +1,5 @@
-ant.build.javac.source=1.3
-ant.build.javac.target=1.3
+ant.build.javac.source=1.6
+ant.build.javac.target=1.6
+verbose=false
+debug=true
+javadoc=api
Modified: trunk/libmetadata-extractor-java/debian/changelog
===================================================================
--- trunk/libmetadata-extractor-java/debian/changelog 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/changelog 2013-07-23 22:13:38 UTC (rev 17058)
@@ -1,9 +1,23 @@
-libmetadata-extractor-java (2.3.1+dfsg-3) UNRELEASED; urgency=low
+libmetadata-extractor-java (2.6.4-1) experimental; urgency=low
- * Updated Standards-Version to 3.9.4 (no changes)
- * Use canonical URLs for the Vcs-* fields
+ * New upstream release
+ - Removed 20nosun.dpatch (applied upstream)
+ - Added a patch to set the encoding of the source files
+ * Install the Maven pom and the jar into /usr/share/maven-repo
+ * Linked the javadoc with the default-jdk-doc
+ * Enabled the debugging info in the compiled classes
+ * Removed 10buildxml.dpatch to enable the unit tests
+ * debian/rules:
+ - Added a get-orig-source target to build the source tarball
+ - Added a get-orig-pom target to fetch the Maven pom
+ * debian/control:
+ - Updated Standards-Version to 3.9.4 (no changes)
+ - Use canonical URLs for the Vcs-* fields
+ - libmetadata-extractor-java-doc suggests libmetadata-extractor-java
+ but no longer recommends it
+ * debian/copyright: Updated to the Copyright Format 1.0
- -- Emmanuel Bourg <ebourg at apache.org> Mon, 22 Jul 2013 16:17:46 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 23 Jul 2013 23:55:43 +0200
libmetadata-extractor-java (2.3.1+dfsg-2) unstable; urgency=low
Modified: trunk/libmetadata-extractor-java/debian/control
===================================================================
--- trunk/libmetadata-extractor-java/debian/control 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/control 2013-07-23 22:13:38 UTC (rev 17058)
@@ -3,7 +3,16 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant, junit
+Build-Depends: ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 5),
+ default-jdk,
+ default-jdk-doc,
+ javahelper,
+ junit4,
+ libxmpcore-java,
+ maven-repo-helper
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pk-java/trunk/libmetadata-extractor-java
Vcs-Browser: http://anonscm.debian.or/viewvc/pkg-java/trunk/libmetadata-extractor-java/
@@ -11,7 +20,7 @@
Package: libmetadata-extractor-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: libxmpcore-java, ${misc:Depends}
Suggests: libmetadata-extractor-java-doc
Description: JPEG metadata extraction framework
Java based metadata extraction library for JPEG images
@@ -19,13 +28,14 @@
manufacturer specific metadata of several digital camera models.
Package: libmetadata-extractor-java-doc
-Recommends: libmetadata-extractor-java
Architecture: all
+Section: doc
Depends: ${misc:Depends}
-Section: doc
+Suggests: libmetadata-extractor-java
+Recommends: default-jdk-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.
+ This package provides the Javadoc API documentation.
Modified: trunk/libmetadata-extractor-java/debian/copyright
===================================================================
--- trunk/libmetadata-extractor-java/debian/copyright 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/copyright 2013-07-23 22:13:38 UTC (rev 17058)
@@ -1,36 +1,18 @@
-This package was debianized by Andreas Putzo <andreas at putzo.net> on
-Fri, 20 Jul 2007 19:15:37 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: metadata-extractor
+Upstream-Contact: Drew Noakes <drew at drewnoakes.com>
+Source: https://code.google.com/p/metadata-extractor/
-It was downloaded from http://www.drewnoakes.com/code/exif/releases/metadata-extractor-2.3.1-src.jar
-The downloaded JAR file has been repackaged as GNU zip'ed tarball after removing
-Libraries/junit.jar, which contains compiled files that are provided by the junit
-package on Debian systems.
+Files: *
+Copyright: 2002-2012, Drew Noakes
+License: Apache-2.0
+ On Debian systems you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
-Upstream Author: Drew Noakes <drew at drewnoakes.com>
-
-Copyright: 2002-2007 Drew Noakes
-
-
-The package does not contain a separate license file. However, on the upstream website,
-http://www.drewnoakes.com/code/exif/, the author states:
-"This metadata library is available with Java source code for usage in the public domain."
-All source files contain what is given below.
-
-License:
-
- This is public domain software - that is, you can do whatever you want
- with it, and include it software that is licensed under the GNU or the
- BSD license, or whatever other licence you choose, including proprietary
- closed source licenses. I do ask that you leave this header in tact.
-
- If you make modifications to this code that you think would benefit the
- wider community, please send me a copy and I'll post it on my site.
-
- If you make use of this code, I'd appreciate hearing about it.
- drew at drewnoakes.com
- Latest version of this software kept at
- http://drewnoakes.com/
-
-
-The Debian packaging is (C) 2007, Andreas Putzo <andreas at putzo.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: 2007, Andreas Putzo <andreas at putzo.net>
+ 2010, Torsten Werner <twerner at debian.org>
+ 2013, Emmanuel Bourg <ebourg at apache.org>
+License: GPL-2
+ On Debian systems you can find the complete text of the
+ GPL-2 license in '/usr/share/common-licenses/GPL-2'
Added: trunk/libmetadata-extractor-java/debian/libmetadata-extractor-java.classpath
===================================================================
--- trunk/libmetadata-extractor-java/debian/libmetadata-extractor-java.classpath (rev 0)
+++ trunk/libmetadata-extractor-java/debian/libmetadata-extractor-java.classpath 2013-07-23 22:13:38 UTC (rev 17058)
@@ -0,0 +1 @@
+usr/share/java/metadata-extractor.jar xmpcore.jar
Added: trunk/libmetadata-extractor-java/debian/maven.ignoreRules
===================================================================
--- trunk/libmetadata-extractor-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libmetadata-extractor-java/debian/maven.ignoreRules 2013-07-23 22:13:38 UTC (rev 17058)
@@ -0,0 +1,4 @@
+
+junit junit * * * *
+xerces xercesImpl * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
Added: trunk/libmetadata-extractor-java/debian/maven.rules
===================================================================
--- trunk/libmetadata-extractor-java/debian/maven.rules (rev 0)
+++ trunk/libmetadata-extractor-java/debian/maven.rules 2013-07-23 22:13:38 UTC (rev 17058)
@@ -0,0 +1,2 @@
+
+com.drewnoakes metadata-extractor jar s/.*/debian/ * *
Added: trunk/libmetadata-extractor-java/debian/metadata-extractor.pom
===================================================================
--- trunk/libmetadata-extractor-java/debian/metadata-extractor.pom (rev 0)
+++ trunk/libmetadata-extractor-java/debian/metadata-extractor.pom 2013-07-23 22:13:38 UTC (rev 17058)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
+ <version>2.6.4</version>
+ <packaging>jar</packaging>
+
+ <name>metadata-extractor</name>
+ <description>Java library for reading metadata from image files.</description>
+ <url>http://code.google.com/p/metadata-extractor/</url>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://code.google.com/r/raygauss-metadata-extractor/</connection>
+ <developerConnection>scm:git:https://code.google.com/r/raygauss-metadata-extractor/</developerConnection>
+ <url>https://code.google.com/r/raygauss-metadata-extractor/</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>drewnoakes</id>
+ <name>Drew Noakes</name>
+ </developer>
+ </developers>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.xmp</groupId>
+ <artifactId>xmpcore</artifactId>
+ <version>5.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/libmetadata-extractor-java/debian/patches/01_build.patch
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/01_build.patch (rev 0)
+++ trunk/libmetadata-extractor-java/debian/patches/01_build.patch 2013-07-23 22:13:38 UTC (rev 17058)
@@ -0,0 +1,55 @@
+Description: Tweaks to build the project
+Author: Emmanuel Bourg <ebourg at apache.org>
+--- a/build.xml
++++ b/build.xml
+@@ -56,6 +56,7 @@
+ source="${java-version}"
+ target="${java-version}"
+ debug="${debug}"
++ encoding="UTF-8"
+ verbose="${verbose}"/>
+ <javac classpath="${classpath};${output}"
+ srcdir="${test-src}"
+@@ -106,7 +107,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">
+@@ -121,6 +121,7 @@
+ <delete verbose="${verbose}" dir="${javadoc}" />
+ <javadoc
+ destdir="${javadoc}"
++ encoding="UTF-8"
+ defaultexcludes="yes"
+ author="true"
+ version="true"
+@@ -132,18 +133,15 @@
+ <!-- be sure to only use single quotes in the CDATA sections below -->
+ <!-- TODO include <link rel='shortcut icon' href='http://metadata-extractor.googlecode.com/git/Resources/metadata-extractor.ico' /> -->
+ <header><![CDATA[<a href='http://www.drewnoakes.com/code/exif/' title='Go to the project home page.'><img src='http://metadata-extractor.googlecode.com/git/Resources/metadata-extractor-logo-131x30.png' border="0" alt='Metadata Extractor Logo'></a>]]></header>
+- <bottom><![CDATA[<i>Copyright © 2003-2012 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 © 2003-2012 Drew Noakes. All Rights Reserved.</i>]]></bottom>
+
+ <packageset dir="${src}" defaultexcludes="yes">
+ <include name="com/**"/>
+ <!--<exclude name="com/**/test"/>-->
+ </packageset>
+
++ <link href="/usr/share/doc/default-jdk-doc/api"/>
++
+ </javadoc>
+ <copy file="Resources/javadoc-stylesheet.css" tofile="${javadoc}/stylesheet.css" overwrite="yes" />
+ </target>
+@@ -153,3 +151,4 @@
+ <target name="dist-all" depends="dist-source, dist-binaries" description="prepare source and binary distributions"/>
+
+ </project>
++
Deleted: trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch 2013-07-23 22:13:38 UTC (rev 17058)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10buildxml.dpatch by Andreas Putzo <andreas at putzo.net>
-##
-## DP: Adjust build.xml file.
-
- at DPATCH@
-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"/>
Modified: trunk/libmetadata-extractor-java/debian/patches/series
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/series 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/patches/series 2013-07-23 22:13:38 UTC (rev 17058)
@@ -1,2 +1 @@
-10buildxml.dpatch
-20nosun.dpatch
+01_build.patch
Modified: trunk/libmetadata-extractor-java/debian/rules
===================================================================
--- trunk/libmetadata-extractor-java/debian/rules 2013-07-23 17:11:22 UTC (rev 17057)
+++ trunk/libmetadata-extractor-java/debian/rules 2013-07-23 22:13:38 UTC (rev 17058)
@@ -6,16 +6,22 @@
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := dist-binaries
+DEB_ANT_BUILD_TARGET := dist-binaries javadoc
+DEB_JARS := xmpcore ant-junit ant-junit4 junit4
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt
-PACKAGE := metadata-extractor
+PACKAGE := libmetadata-extractor-java
clean::
- rm -rf Releases Build api
+ mh_clean
+ rm -rf Releases Build api TestReports
install/libmetadata-extractor-java::
- install -m 644 -D Releases/${PACKAGE}-${DEB_UPSTREAM_VERSION}.jar ${CURDIR}/debian/lib${PACKAGE}-java/usr/share/java/${PACKAGE}-${DEB_UPSTREAM_VERSION}.jar
- dh_link usr/share/java/${PACKAGE}-${DEB_UPSTREAM_VERSION}.jar usr/share/java/${PACKAGE}.jar
+ mh_installpom -p${PACKAGE} --no-parent debian/metadata-extractor.pom
+ mh_installjar -p${PACKAGE} --java-lib debian/metadata-extractor.pom Releases/metadata-extractor-${DEB_UPSTREAM_VERSION}.jar
+ jh_classpath -p${PACKAGE}
+get-orig-pom::
+ wget http://repo1.maven.org/maven2/com/drewnoakes/metadata-extractor/${DEB_UPSTREAM_VERSION}/metadata-extractor-${DEB_UPSTREAM_VERSION}.pom -O debian/metadata-extractor.pom
+
get-orig-source::
uscan --force-download --download-version ${DEB_UPSTREAM_VERSION}
More information about the pkg-java-commits
mailing list