[pkg-java] r17069 - in tags/libmetadata-extractor-java: . 2.6.4-1/debian 2.6.4-1/debian/patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Jul 25 23:03:30 UTC 2013
Author: ebourg-guest
Date: 2013-07-25 23:03:30 +0000 (Thu, 25 Jul 2013)
New Revision: 17069
Added:
tags/libmetadata-extractor-java/2.6.4-1/
tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties
tags/libmetadata-extractor-java/2.6.4-1/debian/changelog
tags/libmetadata-extractor-java/2.6.4-1/debian/control
tags/libmetadata-extractor-java/2.6.4-1/debian/copyright
tags/libmetadata-extractor-java/2.6.4-1/debian/libmetadata-extractor-java.classpath
tags/libmetadata-extractor-java/2.6.4-1/debian/maven.ignoreRules
tags/libmetadata-extractor-java/2.6.4-1/debian/maven.rules
tags/libmetadata-extractor-java/2.6.4-1/debian/metadata-extractor.pom
tags/libmetadata-extractor-java/2.6.4-1/debian/orig-tar.sh
tags/libmetadata-extractor-java/2.6.4-1/debian/patches/01_build.patch
tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series
tags/libmetadata-extractor-java/2.6.4-1/debian/rules
tags/libmetadata-extractor-java/2.6.4-1/debian/watch
Removed:
tags/libmetadata-extractor-java/2.6.4-1/debian/README.Debian
tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties
tags/libmetadata-extractor-java/2.6.4-1/debian/changelog
tags/libmetadata-extractor-java/2.6.4-1/debian/control
tags/libmetadata-extractor-java/2.6.4-1/debian/copyright
tags/libmetadata-extractor-java/2.6.4-1/debian/patches/10buildxml.dpatch
tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series
tags/libmetadata-extractor-java/2.6.4-1/debian/rules
tags/libmetadata-extractor-java/2.6.4-1/debian/watch
Log:
[svn-buildpackage] Tagging libmetadata-extractor-java 2.6.4-1
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/README.Debian
===================================================================
--- trunk/libmetadata-extractor-java/debian/README.Debian 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/README.Debian 2013-07-25 23:03:30 UTC (rev 17069)
@@ -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
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties
===================================================================
--- trunk/libmetadata-extractor-java/debian/ant.properties 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,2 +0,0 @@
-ant.build.javac.source=1.3
-ant.build.javac.target=1.3
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties (from rev 17058, trunk/libmetadata-extractor-java/debian/ant.properties)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/ant.properties 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,5 @@
+ant.build.javac.source=1.6
+ant.build.javac.target=1.6
+verbose=false
+debug=true
+javadoc=api
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/changelog
===================================================================
--- trunk/libmetadata-extractor-java/debian/changelog 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/changelog 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,51 +0,0 @@
-libmetadata-extractor-java (2.3.1+dfsg-2) unstable; urgency=low
-
- * Team upload
-
- [ Michael Koch ]
- * Updated watch file to remove '+dfsg' from local version.
-
- [ Torsten Werner ]
- * Change Section: java.
- * Switch to default-jdk (Closes: #577902).
- * Add Depends: ${misc:Depends}.
- * Remove Andreas Putzo from Uploaders list.
- * Switch to source format 3.0.
- * Add Vcs headers.
- * Update Standards-Version: 3.8.4.
- * Refer to license file GPL-2.
-
- -- Torsten Werner <twerner at debian.org> Thu, 15 Apr 2010 16:37:53 +0200
-
-libmetadata-extractor-java (2.3.1+dfsg-1) unstable; urgency=low
-
- * Add 20nosun.dpatch provided by Gabriel Ebner to remove
- all references to the com.sun classes.
- Package builds with a free java implementation now and thus
- can be uploaded to main.
- Changed upstream_version to re-upload orig.tar.gz.
- * Add Debian readme file to explain differences to the upstream version.
- * 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 <andreas at putzo.net> Wed, 12 Dec 2007 07:36:52 +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.
-
- -- Andreas Putzo <andreas at putzo.net> Wed, 12 Sep 2007 20:52:57 +0000
-
-libmetadata-extractor-java (2.3.1-1) unstable; urgency=low
-
- * Initial release (Closes: #434090)
-
- -- Andreas Putzo <andreas at putzo.net> Fri, 20 Jul 2007 19:15:37 +0000
-
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/changelog (from rev 17058, trunk/libmetadata-extractor-java/debian/changelog)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/changelog (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/changelog 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,72 @@
+libmetadata-extractor-java (2.6.4-1) experimental; urgency=low
+
+ * 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> Tue, 23 Jul 2013 23:55:43 +0200
+
+libmetadata-extractor-java (2.3.1+dfsg-2) unstable; urgency=low
+
+ * Team upload
+
+ [ Michael Koch ]
+ * Updated watch file to remove '+dfsg' from local version.
+
+ [ Torsten Werner ]
+ * Change Section: java.
+ * Switch to default-jdk (Closes: #577902).
+ * Add Depends: ${misc:Depends}.
+ * Remove Andreas Putzo from Uploaders list.
+ * Switch to source format 3.0.
+ * Add Vcs headers.
+ * Update Standards-Version: 3.8.4.
+ * Refer to license file GPL-2.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 15 Apr 2010 16:37:53 +0200
+
+libmetadata-extractor-java (2.3.1+dfsg-1) unstable; urgency=low
+
+ * Add 20nosun.dpatch provided by Gabriel Ebner to remove
+ all references to the com.sun classes.
+ Package builds with a free java implementation now and thus
+ can be uploaded to main.
+ Changed upstream_version to re-upload orig.tar.gz.
+ * Add Debian readme file to explain differences to the upstream version.
+ * 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 <andreas at putzo.net> Wed, 12 Dec 2007 07:36:52 +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.
+
+ -- Andreas Putzo <andreas at putzo.net> Wed, 12 Sep 2007 20:52:57 +0000
+
+libmetadata-extractor-java (2.3.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #434090)
+
+ -- Andreas Putzo <andreas at putzo.net> Fri, 20 Jul 2007 19:15:37 +0000
+
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/control
===================================================================
--- trunk/libmetadata-extractor-java/debian/control 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/control 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,30 +0,0 @@
-Source: libmetadata-extractor-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant, junit
-Standards-Version: 3.8.4
-Homepage: http://www.drewnoakes.com/code/exif/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmetadata-extractor-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmetadata-extractor-java/
-
-Package: libmetadata-extractor-java
-Architecture: all
-Depends: ${misc:Depends}
-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.
-
-Package: libmetadata-extractor-java-doc
-Recommends: libmetadata-extractor-java
-Architecture: all
-Depends: ${misc:Depends}
-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.
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/control (from rev 17058, trunk/libmetadata-extractor-java/debian/control)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/control (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/control 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,41 @@
+Source: libmetadata-extractor-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+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/
+Homepage: http://www.drewnoakes.com/code/exif/
+
+Package: libmetadata-extractor-java
+Architecture: all
+Depends: libxmpcore-java, ${misc:Depends}
+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.
+
+Package: libmetadata-extractor-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+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.
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/copyright
===================================================================
--- trunk/libmetadata-extractor-java/debian/copyright 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/copyright 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,36 +0,0 @@
-This package was debianized by Andreas Putzo <andreas at putzo.net> on
-Fri, 20 Jul 2007 19:15:37 +0000.
-
-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.
-
-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'.
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/copyright (from rev 17058, trunk/libmetadata-extractor-java/debian/copyright)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/copyright (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/copyright 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,18 @@
+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/
+
+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'
+
+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'
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/libmetadata-extractor-java.classpath (from rev 17058, trunk/libmetadata-extractor-java/debian/libmetadata-extractor-java.classpath)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/libmetadata-extractor-java.classpath (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/libmetadata-extractor-java.classpath 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1 @@
+usr/share/java/metadata-extractor.jar xmpcore.jar
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/maven.ignoreRules (from rev 17058, trunk/libmetadata-extractor-java/debian/maven.ignoreRules)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/maven.ignoreRules (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/maven.ignoreRules 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,4 @@
+
+junit junit * * * *
+xerces xercesImpl * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/maven.rules (from rev 17058, trunk/libmetadata-extractor-java/debian/maven.rules)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/maven.rules (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/maven.rules 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,2 @@
+
+com.drewnoakes metadata-extractor jar s/.*/debian/ * *
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/metadata-extractor.pom (from rev 17058, trunk/libmetadata-extractor-java/debian/metadata-extractor.pom)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/metadata-extractor.pom (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/metadata-extractor.pom 2013-07-25 23:03:30 UTC (rev 17069)
@@ -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>
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/orig-tar.sh (from rev 17053, trunk/libmetadata-extractor-java/debian/orig-tar.sh)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/orig-tar.sh (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/orig-tar.sh 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../libmetadata-extractor-java_$VERSION.orig.tar.gz
+DIR=metadata-extractor-$VERSION
+
+git clone --branch 2.6.4 https://code.google.com/p/metadata-extractor $DIR
+rm -Rf $DIR/*.iml $DIR/.git* $DIR/Javadoc/* $DIR/Libraries/*
+
+tar -c -z -f $TAR $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/patches/01_build.patch (from rev 17058, trunk/libmetadata-extractor-java/debian/patches/01_build.patch)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/patches/01_build.patch (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/patches/01_build.patch 2013-07-25 23:03:30 UTC (rev 17069)
@@ -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: tags/libmetadata-extractor-java/2.6.4-1/debian/patches/10buildxml.dpatch
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/10buildxml.dpatch 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/patches/10buildxml.dpatch 2013-07-25 23:03:30 UTC (rev 17069)
@@ -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"/>
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series
===================================================================
--- trunk/libmetadata-extractor-java/debian/patches/series 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,2 +0,0 @@
-10buildxml.dpatch
-20nosun.dpatch
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series (from rev 17058, trunk/libmetadata-extractor-java/debian/patches/series)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/patches/series 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1 @@
+01_build.patch
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/rules
===================================================================
--- trunk/libmetadata-extractor-java/debian/rules 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/rules 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules file for libmetadata-extractor-java (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := dist-binaries
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt
-LIBRARY := metadata-extractor
-DEB_UPSTREAM_VERSION := 2.3.1
-
-clean::
- rm -rf Releases Build api
-
-install/libmetadata-extractor-java::
- install -m 644 -D Releases/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar ${CURDIR}/debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar
- dh_link usr/share/java/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar usr/share/java/${LIBRARY}.jar
-
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/rules (from rev 17058, trunk/libmetadata-extractor-java/debian/rules)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/rules (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/rules 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# debian/rules file for libmetadata-extractor-java (uses cdbs)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_ANT_BUILD_TARGET := dist-binaries javadoc
+DEB_JARS := xmpcore ant-junit ant-junit4 junit4
+DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt
+PACKAGE := libmetadata-extractor-java
+
+clean::
+ mh_clean
+ rm -rf Releases Build api TestReports
+
+install/libmetadata-extractor-java::
+ 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}
Deleted: tags/libmetadata-extractor-java/2.6.4-1/debian/watch
===================================================================
--- trunk/libmetadata-extractor-java/debian/watch 2013-07-21 06:09:13 UTC (rev 17045)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/watch 2013-07-25 23:03:30 UTC (rev 17069)
@@ -1,3 +0,0 @@
-version=3
-opts=dversionmangle=s/\+dfsg$// \
-http://code.google.com/p/metadata-extractor/downloads/list .*/metadata-extractor-([\d\.]*)\.zip
Copied: tags/libmetadata-extractor-java/2.6.4-1/debian/watch (from rev 17053, trunk/libmetadata-extractor-java/debian/watch)
===================================================================
--- tags/libmetadata-extractor-java/2.6.4-1/debian/watch (rev 0)
+++ tags/libmetadata-extractor-java/2.6.4-1/debian/watch 2013-07-25 23:03:30 UTC (rev 17069)
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+dfsg$// \
+http://code.google.com/p/metadata-extractor/downloads/list .*/metadata-extractor-([\d\.]*)\.zip debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list