The following commit has been merged in the master branch:
commit 5ed88cd1e8c61af1e28fec2c9ebcae47144a529b
Author: David Paleino <da...@debian.org>
Date:   Sun Oct 10 22:04:43 2010 +0200

    debian/patches/60_wmsplugin.diff refreshed to cleanly apply

diff --git a/debian/changelog b/debian/changelog
index 0078cfd..f374fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
   * debian/control:
     - added two new packages: webkit-image-qt and webkit-image-gtk
     - bumped dependencies on JOSM to 3592
+  * debian/patches/60_wmsplugin.diff refreshed to cleanly apply
 
- -- David Paleino <da...@debian.org>  Sun, 10 Oct 2010 22:02:18 +0200
+ -- David Paleino <da...@debian.org>  Sun, 10 Oct 2010 22:04:33 +0200
 
 josm-plugins (0.0.svn23040-1) unstable; urgency=low
 
diff --git a/debian/patches/60_wmsplugin.diff b/debian/patches/60_wmsplugin.diff
index 275e9d6..a80b78d 100644
--- a/debian/patches/60_wmsplugin.diff
+++ b/debian/patches/60_wmsplugin.diff
@@ -7,8 +7,8 @@ Patch for plugin wmsplugin
 
 --- josm-plugins.orig/wmsplugin/build.xml
 +++ josm-plugins/wmsplugin/build.xml
-@@ -32,9 +32,9 @@
- 
+@@ -31,9 +31,9 @@
+       <property name="plugin.main.version" value="3530" />
  
        <property name="josm" location="../../core/dist/josm-custom.jar" />
 -      <property name="remotecontrol" location="../../dist/remotecontrol.jar" 
/>
@@ -18,7 +18,7 @@ Patch for plugin wmsplugin
        <property name="plugin.jar" 
value="${plugin.dist.dir}/${ant.project.name}.jar" />
        <property name="ant.build.javac.target" value="1.5" />
  
-@@ -48,7 +48,7 @@
+@@ -47,7 +47,7 @@
                        <compilerarg value="-Xlint:unchecked" />
                </javac>
        </target>

-- 
Plugins for josm

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to