[DebianGIS-dev] r1895 - in packages/josm-plugins/trunk/debian: . patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2009-02-16 10:26:40 +0000 (Mon, 16 Feb 2009)
New Revision: 1895

Modified:
   packages/josm-plugins/trunk/debian/control
   packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
Log:
Added libmetadata-extractor-java in compilation and as dependency (used
by agpifoj)


Modified: packages/josm-plugins/trunk/debian/control
===================================================================
--- packages/josm-plugins/trunk/debian/control	2009-02-16 10:13:35 UTC (rev 1894)
+++ packages/josm-plugins/trunk/debian/control	2009-02-16 10:26:40 UTC (rev 1895)
@@ -4,7 +4,7 @@
 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 @@
 
 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.

Modified: packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch	2009-02-16 10:13:35 UTC (rev 1894)
+++ packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch	2009-02-16 10:26:40 UTC (rev 1895)
@@ -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 @@
          <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">