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

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2008-04-13 13:12:04 +0000 (Sun, 13 Apr 2008)
New Revision: 1534

Modified:
   packages/josm-plugins/trunk/debian/master.xml
   packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
Log:
Making again revision number available also at build time for
ywms and validator


Modified: packages/josm-plugins/trunk/debian/master.xml
===================================================================
--- packages/josm-plugins/trunk/debian/master.xml	2008-04-13 13:05:56 UTC (rev 1533)
+++ packages/josm-plugins/trunk/debian/master.xml	2008-04-13 13:12:04 UTC (rev 1534)
@@ -5,7 +5,9 @@
     <property name="josm"               location="/usr/share/josm/josm.jar"/>
     <property name="plugin.dist.dir"    value="../dist"/>
 
+    <xmlproperty file="../svn-info.xml" prefix="version" keepRoot="false" collapseAttributes="true"/>
 
+
     <target name="init">
         <mkdir dir="../dist"/> 
         <mkdir dir="../tmp/josm/lib"/>

Modified: packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch	2008-04-13 13:05:56 UTC (rev 1533)
+++ packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch	2008-04-13 13:12:04 UTC (rev 1534)
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.20080413/validator/build.xml
---- josm-plugins-0.0.0.20080413~/validator/build.xml	2008-04-06 19:10:11.000000000 +0000
-+++ josm-plugins-0.0.0.20080413/validator/build.xml	2008-04-13 10:42:15.000000000 +0000
-@@ -29,20 +29,10 @@
+--- josm-plugins-0.0.0.20080413~/validator/build.xml	2008-04-06 21:10:11.000000000 +0200
++++ josm-plugins-0.0.0.20080413/validator/build.xml	2008-04-13 13:15:38.000000000 +0200
+@@ -29,14 +29,6 @@
      <copy todir="build/images">
        <fileset dir="images"/>
      </copy>
@@ -23,16 +23,10 @@
      <jar destfile="${plugin.jar}" basedir="build">
        <manifest>
  	<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
- 	<attribute name="Plugin-Description" value="A OSM data validator"/>
--	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
--	<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- 	<attribute name="Author" value="Francisco R. Santos &lt;frsantos at gmail.com>"/>
-       </manifest>
-     </jar>
 diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080413/ywms/build.xml
---- josm-plugins-0.0.0.20080413~/ywms/build.xml	2008-04-06 19:10:11.000000000 +0000
-+++ josm-plugins-0.0.0.20080413/ywms/build.xml	2008-04-13 10:42:23.000000000 +0000
-@@ -29,20 +29,10 @@
+--- josm-plugins-0.0.0.20080413~/ywms/build.xml	2008-04-06 21:10:11.000000000 +0200
++++ josm-plugins-0.0.0.20080413/ywms/build.xml	2008-04-13 13:15:11.000000000 +0200
+@@ -29,14 +29,6 @@
      <copy todir="${plugin.build.dir}/images">
        <fileset dir="images"/>
      </copy>
@@ -47,9 +41,3 @@
      <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
        <manifest>
  	<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ywms.YWMSPlugin"/>
- 	<attribute name="Plugin-Description" value="A WMS server for Yahoo imagery based on Firefox"/>
--	<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
--	<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
- 	<attribute name="Author" value="Francisco R. Santos &lt;frsantos at gmail.com>"/>
-       </manifest>
-     </jar>