[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-16-gd540c1a
The following commit has been merged in the master branch: commit 67a66f95641d445dcaf4974d9d6d4404e9fbdffb Merge: 1370c11b2ff7d74aa1648cc4f9ef9f40d8838cbb 2d3e40973c8d066ce908852bdf92201b4a845413 Author: David Paleino da...@debian.org Date: Wed Dec 8 19:45:17 2010 +0100 Merge commit 'upstream/0.0.svn24632' -- 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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-16-gd540c1a
The following commit has been merged in the master branch: commit 61393a30b66ae947699ce4b91b419cf7a527a388 Author: David Paleino da...@debian.org Date: Wed Dec 8 19:45:31 2010 +0100 New upstream snapshot diff --git a/debian/changelog b/debian/changelog index f0f520b..5687739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm-plugins (0.0.svn24632-1) UNRELEASED; urgency=low + + * New upstream snapshot + + -- David Paleino da...@debian.org Wed, 08 Dec 2010 19:45:22 +0100 + josm-plugins (0.0.svn24572-1) unstable; urgency=low * New upstream snapshot -- 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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-16-gd540c1a
The following commit has been merged in the master branch: commit aa888bad552c9b7d0891b2fd464451be7cf7010e Author: David Paleino da...@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 da...@debian.org Wed, 08 Dec 2010 19:45:22 +0100 + -- David Paleino da...@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.0 +0200 -+++ josm-plugins/DirectUpload/build.xml2010-03-30 10:55:01.0 +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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-16-gd540c1a
The following commit has been merged in the master branch:
commit ebf330aaccf17aa8774012823fd14c91dce1daa3
Author: David Paleino da...@debian.org
Date: Wed Dec 8 19:47:29 2010 +0100
Bump JOSM requirement on 3701
diff --git a/debian/changelog b/debian/changelog
index 26a0011..273ef11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm-plugins (0.0.svn24632-1) UNRELEASED; urgency=low
* New upstream snapshot
* debian/patches/* refreshed
+ * Bump JOSM requirement on 3701
- -- David Paleino da...@debian.org Wed, 08 Dec 2010 19:47:11 +0100
+ -- David Paleino da...@debian.org Wed, 08 Dec 2010 19:51:42 +0100
josm-plugins (0.0.svn24572-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0bc7b01..953f1df 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
ant
, debhelper (= 8~)
, default-jdk
- , josm (= 0.0.svn3695)
+ , josm (= 0.0.svn3701)
, libmetadata-extractor-java
, liblog4j1.2-java
, libjgrapht0.8-java
@@ -20,7 +20,7 @@ Build-Depends:
, qt4-qmake
, libwebkit-dev
, libglib2.0-dev
-Build-Conflicts: josm (= 0.0.svn3696)
+Build-Conflicts: josm (= 0.0.svn3702)
Standards-Version: 3.9.1
Homepage: http://josm.openstreetmap.de/wiki/Plugins
Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git
@@ -30,11 +30,11 @@ Package: josm-plugins
Architecture: all
Depends:
${misc:Depends}
- , josm (= 0.0.svn3695)
+ , josm (= 0.0.svn3701)
, libmetadata-extractor-java
, liblog4j1.2-java
, libjgrapht0.8-java
-Breaks: josm (= 0.0.svn3696)
+Breaks: josm (= 0.0.svn3702)
Recommends: webkit-image-gtk | webkit-image-qt
Suggests: gpsd
Description: Plugins for JOSM
--
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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-16-gd540c1a
The following commit has been merged in the master branch: commit d540c1abaa74e845fdd080f338f90074d5a55900 Author: David Paleino da...@debian.org Date: Wed Dec 8 19:52:15 2010 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 273ef11..2a7e478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -josm-plugins (0.0.svn24632-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn24632-1) unstable; urgency=low * New upstream snapshot * debian/patches/* refreshed * Bump JOSM requirement on 3701 - -- David Paleino da...@debian.org Wed, 08 Dec 2010 19:51:42 +0100 + -- David Paleino da...@debian.org Wed, 08 Dec 2010 19:52:09 +0100 josm-plugins (0.0.svn24572-1) unstable; urgency=low -- 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
