[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-15-g3fb2444
David Paleino
dapal at debian.org
Tue Sep 7 09:38:09 UTC 2010
The following commit has been merged in the master branch:
commit 5f28411f15638325ae346d23962df98c97062c98
Author: David Paleino <dapal at debian.org>
Date: Tue Sep 7 10:43:50 2010 +0200
debian/patches/: 150_routing.diff, 60_wmsplugin.diff refreshed to cleanly apply
diff --git a/debian/changelog b/debian/changelog
index 9bc7236..3192153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
josm-plugins (0.0.svn23040-1) UNRELEASED; urgency=low
* New upstream snapshot
+ * debian/patches/:
+ - 150_routing.diff, 60_wmsplugin.diff refreshed to cleanly apply
- -- David Paleino <dapal at debian.org> Tue, 07 Sep 2010 10:42:19 +0200
+ -- David Paleino <dapal at debian.org> Tue, 07 Sep 2010 10:43:22 +0200
josm-plugins (0.0.svn22363-1) unstable; urgency=low
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 22c8b72..4c354ad 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -1,9 +1,12 @@
Patch for plugin routing
* Disable upstream SVN access
* Fix build classpath and MANIFEST metadata
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/routing/build.xml josm-plugins/routing/build.xml
---- josm-plugins~/routing/build.xml 2010-05-14 17:02:29.000000000 +0200
-+++ josm-plugins/routing/build.xml 2010-05-14 17:30:34.000000000 +0200
+---
+ routing/build.xml | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+--- josm-plugins.orig/routing/build.xml
++++ josm-plugins/routing/build.xml
@@ -34,8 +34,8 @@
<property name="plugin.dist.dir" value="../../dist"/>
<property name="plugin.build.dir" value="build"/>
@@ -26,7 +29,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
<copy todir="${plugin.build.dir}/">
<fileset dir="resources">
<include name="*.xml"/>
-@@ -76,6 +74,7 @@
+@@ -77,6 +75,7 @@
<attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
<attribute name="Plugin-Stage" value="50"/>
<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
diff --git a/debian/patches/60_wmsplugin.diff b/debian/patches/60_wmsplugin.diff
index c20157a..8b74e82 100644
--- a/debian/patches/60_wmsplugin.diff
+++ b/debian/patches/60_wmsplugin.diff
@@ -1,9 +1,12 @@
Patch for plugin wmsplugin
* Disable upstream SVN access
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/wmsplugin/build.xml josm-plugins/wmsplugin/build.xml
---- josm-plugins~/wmsplugin/build.xml 2010-03-30 00:03:05.000000000 +0200
-+++ josm-plugins/wmsplugin/build.xml 2010-03-30 10:52:11.000000000 +0200
-@@ -47,7 +47,7 @@
+---
+ wmsplugin/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- josm-plugins.orig/wmsplugin/build.xml
++++ josm-plugins/wmsplugin/build.xml
+@@ -48,7 +48,7 @@
<compilerarg value="-Xlint:unchecked" />
</javac>
</target>
--
Plugins for josm
More information about the Pkg-grass-devel
mailing list