[josm-plugins] 46/369: Added libmetadata-extractor-java in compilation and as dependency (used by agpifoj)

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository josm-plugins.

commit b40f16cc268a6d32b35dacba356c68b2a70afa9f
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Mon Feb 16 10:26:40 2009 +0000

    Added libmetadata-extractor-java in compilation and as dependency (used
    by agpifoj)
---
 debian/control                   |  4 ++--
 debian/patches/70_agpifoj.dpatch | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 3cd83e2..cfceb08 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Giovanni Mascellani <g.mascellani at gmail.com>, Andreas Putzo <andreas at putzo.net>
 Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk,
- josm (>= 0.0.svn1387)
+ josm (>= 0.0.svn1387), libmetadata-extractor-java
 Standards-Version: 3.8.0
 Homepage: http://josm.openstreetmap.de
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
 
 Package: josm-plugins
 Architecture: all
-Depends: josm (>= 0.0.svn1387)
+Depends: josm (>= 0.0.svn1387), libmetadata-extractor-java
 Suggests: gpsd, iceweasel
 Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.
diff --git a/debian/patches/70_agpifoj.dpatch b/debian/patches/70_agpifoj.dpatch
index 0e360b0..3225ee0 100755
--- a/debian/patches/70_agpifoj.dpatch
+++ b/debian/patches/70_agpifoj.dpatch
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml
 --- trunk~/agpifoj/build.xml	2009-01-01 18:55:45.000000000 +0100
-+++ trunk/agpifoj/build.xml	2009-02-16 11:08:56.000000000 +0100
++++ trunk/agpifoj/build.xml	2009-02-16 11:23:37.000000000 +0100
 @@ -27,14 +27,6 @@
          <copy todir="build/images">
              <fileset dir="images" />
@@ -23,3 +23,14 @@ diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml
          <jar destfile="${plugin.jar}" basedir="build">
              <manifest>
                  <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.agpifoj.AgpifojPlugin" />
+@@ -50,6 +42,10 @@
+         <echo message="creating ${plugin.jar}"/>
+         <javac srcdir="src" classpath="${josm}" destdir="build">
+             <compilerarg value="-Xlint:deprecation"/>
++            <classpath>
++                <file file="${josm}"/>
++                <file file="/usr/share/java/metadata-extractor.jar"/>
++            </classpath>
+         </javac>
+     </target>
+     <target name="init">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git