[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-16-gd540c1a

[David Paleino]

The following commit has been merged in the master branch:
commit aa888bad552c9b7d0891b2fd464451be7cf7010e
Author: David Paleino <dapal at debian.org>
Date:   Wed Dec 8 19:47:19 2010 +0100

    debian/patches/* refreshed

diff --git a/debian/changelog b/debian/changelog
index 5687739..26a0011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm-plugins (0.0.svn24632-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
+  * debian/patches/* refreshed
 
- -- David Paleino <dapal at debian.org>  Wed, 08 Dec 2010 19:45:22 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 08 Dec 2010 19:47:11 +0100
 
 josm-plugins (0.0.svn24572-1) unstable; urgency=low
 
diff --git a/debian/patches/120_DirectUpload.diff b/debian/patches/120_DirectUpload.diff
index 650e903..d485272 100644
--- a/debian/patches/120_DirectUpload.diff
+++ b/debian/patches/120_DirectUpload.diff
@@ -1,8 +1,11 @@
 Patch for plugin DirectUpload
  * Disable upstream SVN access
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/DirectUpload/build.xml josm-plugins/DirectUpload/build.xml
---- josm-plugins~/DirectUpload/build.xml	2010-03-30 00:03:05.000000000 +0200
-+++ josm-plugins/DirectUpload/build.xml	2010-03-30 10:55:01.000000000 +0200
+---
+ DirectUpload/build.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- josm-plugins.orig/DirectUpload/build.xml
++++ josm-plugins/DirectUpload/build.xml
 @@ -44,7 +44,7 @@
  			<compilerarg value="-Xlint:unchecked"/>
  		</javac>
diff --git a/debian/patches/130_editgpx.diff b/debian/patches/130_editgpx.diff
index 8c44952..6a90368 100644
--- a/debian/patches/130_editgpx.diff
+++ b/debian/patches/130_editgpx.diff
@@ -6,7 +6,7 @@ Patch for plugin editgpx
 
 --- josm-plugins.orig/editgpx/build.xml
 +++ josm-plugins/editgpx/build.xml
-@@ -48,7 +48,7 @@
+@@ -46,7 +46,7 @@
  			<compilerarg value="-Xlint:unchecked"/>
  		</javac>
  	</target>

-- 
Plugins for josm