[josm-plugins] 34/369: Making again revision number available also at build time for ywms and validator

[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 8c711f6bc0b55726b82147a243d6a9dc25c89060
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Apr 13 13:12:04 2008 +0000

    Making again revision number available also at build time for
    ywms and validator
---
 debian/master.xml                    |  2 ++
 debian/patches/20_disable_svn.dpatch | 24 ++++++------------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/debian/master.xml b/debian/master.xml
index 836ff66..e1e2310 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -5,6 +5,8 @@
     <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"/> 
diff --git a/debian/patches/20_disable_svn.dpatch b/debian/patches/20_disable_svn.dpatch
index ab482d0..1fa91a1 100755
--- a/debian/patches/20_disable_svn.dpatch
+++ b/debian/patches/20_disable_svn.dpatch
@@ -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 @@ diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.
      <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 <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 @@ diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080
      <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 <frsantos at gmail.com>"/>
-       </manifest>
-     </jar>

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