[libmetadata-extractor-java] 03/07: Refreshed 01_build.patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libmetadata-extractor-java.

commit 70fb27eb92c10651a668a2a3e4ff86f07dc1cad5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 10 15:58:26 2015 +0100

    Refreshed 01_build.patch
---
 debian/changelog              |  1 +
 debian/patches/01_build.patch | 34 +++++++++++-----------------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81b901c..76f0c3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libmetadata-extractor-java (2.7.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+    - Refreshed 01_build.patch
     - Removed 02-fix-exifreader-regression.patch (fixed upstream)
   * Moved the package to Git
   * debian/watch: Watch the release tags on Github
diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch
index 8264bdd..515d6ef 100644
--- a/debian/patches/01_build.patch
+++ b/debian/patches/01_build.patch
@@ -2,15 +2,7 @@ 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 @@
+@@ -130,7 +130,6 @@
              <file file="LICENSE-2.0.txt" />
              <file file="README.txt" />
          </zip>
@@ -18,7 +10,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
      </target>
  
      <target name="dist-source" depends="clean, compile, test" description="generate source distribution">
-@@ -121,6 +121,7 @@
+@@ -151,6 +150,7 @@
          <delete verbose="${verbose}" dir="${javadoc}" />
          <javadoc
              destdir="${javadoc}"
@@ -26,30 +18,26 @@ Author: Emmanuel Bourg <ebourg at apache.org>
              defaultexcludes="yes"
              author="true"
              version="true"
-@@ -132,18 +133,15 @@
+@@ -162,12 +162,7 @@
              <!-- 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>
+             <!-- 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 © 2003-2012 Drew Noakes. All Rights Reserved.</i>]]></bottom>
++            <bottom><![CDATA[<i>Copyright © 2002-2015 Drew Noakes. All Rights Reserved.</i>]]></bottom>
  
+             <!-- Only build Java -->
              <packageset dir="${src}" defaultexcludes="yes">
-                 <include name="com/**"/>
-                 <!--<exclude name="com/**/test"/>-->
-             </packageset>
+@@ -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>
-@@ -153,3 +151,4 @@
-     <target name="dist-all" depends="dist-source, dist-binaries" description="prepare source and binary distributions"/>
- 
- </project>
-+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libmetadata-extractor-java.git