[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3514-2-5-g03f818d
The following commit has been merged in the master branch: commit 03f818d9dc54ed9db88c4d9acc1e71d15f7a6a86 Author: David Paleino da...@debian.org Date: Thu Oct 21 18:29:27 2010 +0200 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 7c057b3..905a6ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -josm (0.0.svn3592-1) UNRELEASED; urgency=low +josm (0.0.svn3592-1) unstable; urgency=low * New upstream snapshot * debian/patches/: - 10-build.patch, 50-preferences_world_readable.patch, 80-fix_images.patch refreshed to cleanly apply - -- David Paleino da...@debian.org Sun, 10 Oct 2010 12:17:25 +0200 + -- David Paleino da...@debian.org Sun, 10 Oct 2010 20:41:25 +0200 josm (0.0.svn3514-2) unstable; urgency=low -- Java OpenStreetMap editor ___ 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 branch, master, updated. debian/0.0.svn3514-2-4-ga45341c
The following commit has been merged in the master branch: commit 2e3ff2cd37c25977aacf0facc4c82422629df299 Merge: cee87176361d2546f39a0ac3d4cf125618d06e0c 84a298581f2d6213ceef1550a8a405b33be07f28 Author: David Paleino da...@debian.org Date: Sun Oct 10 09:35:33 2010 +0200 Merge commit 'upstream/0.0.svn3592' -- Java OpenStreetMap editor ___ 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 branch, master, updated. debian/0.0.svn3514-2-4-ga45341c
The following commit has been merged in the master branch: commit 18be519eba24b9e5be79c5ce3afcdbb841b55e6a Author: David Paleino da...@debian.org Date: Sun Oct 10 09:44:41 2010 +0200 New upstream snapshot diff --git a/debian/changelog b/debian/changelog index e0ec7b7..abbd675 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn3592-1) UNRELEASED; urgency=low + + * New upstream snapshot + + -- David Paleino da...@debian.org Sun, 10 Oct 2010 09:43:58 +0200 + josm (0.0.svn3514-2) unstable; urgency=low * debian/patches/90-fix_version.patch added, fix inconsistency -- Java OpenStreetMap editor ___ 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 branch, master, updated. debian/0.0.svn3514-2-4-ga45341c
The following commit has been merged in the master branch:
commit a45341c88a02e082bc17b9cd618dc0144b296db9
Author: David Paleino da...@debian.org
Date: Sun Oct 10 12:17:59 2010 +0200
debian/patches/: 10-build.patch, 50-preferences_world_readable.patch,
80-fix_images.patch refreshed to cleanly apply
diff --git a/debian/changelog b/debian/changelog
index abbd675..7c057b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
josm (0.0.svn3592-1) UNRELEASED; urgency=low
* New upstream snapshot
+ * debian/patches/:
+- 10-build.patch, 50-preferences_world_readable.patch,
+ 80-fix_images.patch refreshed to cleanly apply
- -- David Paleino da...@debian.org Sun, 10 Oct 2010 09:43:58 +0200
+ -- David Paleino da...@debian.org Sun, 10 Oct 2010 12:17:25 +0200
josm (0.0.svn3514-2) unstable; urgency=low
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 9ce2716..a0e250d 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -4,9 +4,9 @@ Subject: adjustments to the ant build file, mainly to not
include
Forwarded: no
---
- build.xml | 38 ++
+ build.xml | 36 +---
i18n/build.xml | 26 +-
- 2 files changed, 35 insertions(+), 29 deletions(-)
+ 2 files changed, 34 insertions(+), 28 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
@@ -91,15 +91,7 @@ Forwarded: no
/jar
/target
-@@ -116,13 +104,14 @@ Build-Date: ${build.tstamp}
- zipfileset dir=macosx
includes=JOSM.app/Contents/MacOS/JOSM filemode=755/
- /zip
- /target
--
-+
- target name=compile depends=init
- javac srcdir=src classpathref=classpath destdir=build
- target=1.5 source=1.5 debug=on
encoding=UTF-8
+@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
compilerarg value=-Xlint:deprecation/
compilerarg value=-Xlint:unchecked/
/javac
diff --git a/debian/patches/50-preferences_world_readable.patch
b/debian/patches/50-preferences_world_readable.patch
index 4226162..3e9d1ad 100644
--- a/debian/patches/50-preferences_world_readable.patch
+++ b/debian/patches/50-preferences_world_readable.patch
@@ -8,7 +8,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
--- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
+++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -404,6 +404,14 @@ public class Preferences {
+@@ -337,6 +337,14 @@ public class Preferences {
File tmpFile = new File(prefFile + _tmp);
copyFile(tmpFile, prefFile);
tmpFile.delete();
@@ -23,7 +23,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
}
/**
-@@ -524,6 +532,13 @@ public class Preferences {
+@@ -457,6 +465,13 @@ public class Preferences {
System.err.println(tr(Warning: Failed to initialize
preferences.Failed to reset preference file to default: {0},
getPreferenceFile()));
}
}
diff --git a/debian/patches/80-fix_images.patch
b/debian/patches/80-fix_images.patch
index 58da3da..3e1d475 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: no
--- josm.orig/data/defaultpresets.xml
+++ josm/data/defaultpresets.xml
-@@ -2581,7 +2581,7 @@ are supplied, then values will be trea
+@@ -2623,7 +2623,7 @@ are supplied, then values will be trea
key key=amenity value=cinema /
text key=name text=Name default= delete_if_empty=true /
/item
@@ -18,7 +18,7 @@ Forwarded: no
link
href=http://wiki.openstreetmap.org/wiki/Tag:amenity=library;
fi.href=http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library; /
label text=Edit Library /
-@@ -3119,7 +3119,7 @@ are supplied, then values will be trea
+@@ -3184,7 +3184,7 @@ are supplied, then values will be trea
label text=(Use international code, like +12-345-67890) /
space /
/item
--
Java OpenStreetMap editor
___
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 branch, master, updated. debian/0.0.svn3514-2
The following commit has been merged in the master branch: commit e8c9402c7500a1169a1695122ac71d9e949e1704 Author: David Paleino da...@debian.org Date: Wed Oct 6 09:44:15 2010 +0200 debian/rules, debian/control.in: handle distro-specific Build-Depends, so that this same source package can build on Maverick. diff --git a/debian/changelog b/debian/changelog index 41bce61..6fcfb60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ josm (0.0.svn3514-2) UNRELEASED; urgency=low * debian/patches/90-fix_version.patch added, fix inconsistency between code and upstream website. Thanks to Mario Izquierdo (Closes: #598920) + * debian/rules, debian/control.in: handle distro-specific Build-Depends, +so that this same source package can build on Maverick. - -- David Paleino da...@debian.org Sun, 03 Oct 2010 11:37:39 +0200 + -- David Paleino da...@debian.org Wed, 06 Oct 2010 09:43:43 +0200 josm (0.0.svn3514-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c22e196..dd955f1 100644 --- a/debian/control +++ b/debian/control @@ -13,12 +13,12 @@ Build-Depends: ant, debhelper (= 7.0.50~), gettext, - default-jdk (= 1:1.6), libgettext-commons-java (= 0.9.6), libmetadata-extractor-java, libgettext-ant-tasks-java, libterm-readkey-perl , liboauth-signpost-java (= 1.2) + , default-jdk (= 1:1.6) Standards-Version: 3.9.1 Homepage: http://josm.openstreetmap.de Vcs-Git: git://git.debian.org/pkg-grass/josm.git diff --git a/debian/control b/debian/control.in similarity index 98% copy from debian/control copy to debian/control.in index c22e196..86b61a7 100644 --- a/debian/control +++ b/debian/control.in @@ -13,12 +13,12 @@ Build-Depends: ant, debhelper (= 7.0.50~), gettext, - default-jdk (= 1:1.6), libgettext-commons-java (= 0.9.6), libmetadata-extractor-java, libgettext-ant-tasks-java, libterm-readkey-perl , liboauth-signpost-java (= 1.2) + , %distro_build_depends% Standards-Version: 3.9.1 Homepage: http://josm.openstreetmap.de Vcs-Git: git://git.debian.org/pkg-grass/josm.git diff --git a/debian/rules b/debian/rules index 8f7a7ed..e315c71 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,12 @@ DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1) # Docs are already included in the jar file and can be accessed from within josm. #DEB_INSTALL_DOCS_ALL := +ifeq ($(shell dpkg-vendor --derives-from Ubuntu echo yes),yes) + BUILDDEPENDS=default-jdk (= 1.6) +else + BUILDDEPENDS=default-jdk (= 1:1.6) +endif + %: dh $@ @@ -36,6 +42,13 @@ override_dh_auto_install: install -m 644 $(CURDIR)/debian/icons/josm-32.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm install -m 644 $(CURDIR)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop +override_dh_clean: + dh_clean + + # handle distro-specific Build-Depends + sed -e s/%distro_build_depends%/$(BUILDDEPENDS)/ \ + debian/control.in debian/control + get-orig-source: dh_testdir -- Java OpenStreetMap editor ___ 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 branch, master, updated. debian/0.0.svn3514-2
The following commit has been merged in the master branch:
commit 224696cbd040e509183e91b45a6c9596ba8ca1ab
Author: David Paleino da...@debian.org
Date: Wed Oct 6 09:48:34 2010 +0200
Refresh patch
diff --git a/debian/patches/90-fix_version.patch
b/debian/patches/90-fix_version.patch
index 0042d4c..ddf55a8 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -11,14 +11,14 @@ Forwarded: no
--- josm.orig/build.xml
+++ josm/build.xml
@@ -81,7 +81,7 @@ Debian-Release: ${debian.version}
- !-- add attribute excludes=**/*BZip2*,**/*Bzip2* to
create a non-bzip2 supporting jar --
- manifest
- attribute name=Main-class value=JOSM /
-- attribute name=Main-Version
value=${version.entry.commit.revision} SVN/
-+ attribute name=Main-Version
value=${version.entry.commit.revision}/
- attribute name=Main-Date
value=${version.entry.commit.date}/
- attribute name=Debian-Release
value=${debian.version}/
- attribute name=Class-Path
value=/usr/share/java/gettext-commons.jar
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar/
+ !-- add attribute excludes=**/*BZip2*,**/*Bzip2* to
create a non-bzip2 supporting jar --
+ manifest
+ attribute name=Main-class value=JOSM /
+- attribute name=Main-Version
value=${version.entry.commit.revision} SVN/
++ attribute name=Main-Version
value=${version.entry.commit.revision}/
+ attribute name=Main-Date
value=${version.entry.commit.date}/
+ attribute name=Debian-Release
value=${debian.version}/
+ attribute name=Class-Path
value=/usr/share/java/gettext-commons.jar
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar/
--- josm.orig/src/org/openstreetmap/josm/data/Version.java
+++ josm/src/org/openstreetmap/josm/data/Version.java
@@ -206,9 +206,6 @@ public class Version {
--
Java OpenStreetMap editor
___
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 branch, master, updated. debian/0.0.svn3514-2
The following commit has been merged in the master branch:
commit 3606e771ee8f198d2872eeac2ee47d67c42bd482
Author: David Paleino da...@debian.org
Date: Wed Oct 6 10:24:47 2010 +0200
Revert debian/rules, debian/control.in: handle distro-specific
Build-Depends, so that this same source package can build on Maverick.
This reverts commit e8c9402c7500a1169a1695122ac71d9e949e1704.
diff --git a/debian/changelog b/debian/changelog
index 6fcfb60..41bce61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,8 @@ josm (0.0.svn3514-2) UNRELEASED; urgency=low
* debian/patches/90-fix_version.patch added, fix inconsistency
between code and upstream website. Thanks to Mario Izquierdo
(Closes: #598920)
- * debian/rules, debian/control.in: handle distro-specific Build-Depends,
-so that this same source package can build on Maverick.
- -- David Paleino da...@debian.org Wed, 06 Oct 2010 09:43:43 +0200
+ -- David Paleino da...@debian.org Sun, 03 Oct 2010 11:37:39 +0200
josm (0.0.svn3514-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index dd955f1..c22e196 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,12 @@ Build-Depends:
ant,
debhelper (= 7.0.50~),
gettext,
+ default-jdk (= 1:1.6),
libgettext-commons-java (= 0.9.6),
libmetadata-extractor-java,
libgettext-ant-tasks-java,
libterm-readkey-perl
, liboauth-signpost-java (= 1.2)
- , default-jdk (= 1:1.6)
Standards-Version: 3.9.1
Homepage: http://josm.openstreetmap.de
Vcs-Git: git://git.debian.org/pkg-grass/josm.git
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 86b61a7..000
--- a/debian/control.in
+++ /dev/null
@@ -1,47 +0,0 @@
-Source: josm
-Section: utils
-Priority: extra
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders:
- Andreas Putzo andr...@putzo.net,
- Giovanni Mascellani g...@debian.org,
- Petter Reinholdtsen p...@debian.org,
- David Paleino da...@debian.org,
- Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
-DM-Upload-Allowed: yes
-Build-Depends:
- ant,
- debhelper (= 7.0.50~),
- gettext,
- libgettext-commons-java (= 0.9.6),
- libmetadata-extractor-java,
- libgettext-ant-tasks-java,
- libterm-readkey-perl
- , liboauth-signpost-java (= 1.2)
- , %distro_build_depends%
-Standards-Version: 3.9.1
-Homepage: http://josm.openstreetmap.de
-Vcs-Git: git://git.debian.org/pkg-grass/josm.git
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm.git
-
-Package: josm
-Architecture: all
-Depends:
- openjdk-6-jre | sun-java6-jre,
- libgettext-commons-java (= 0.9.6),
- libmetadata-extractor-java,
- liboauth-signpost-java (= 1.2),
- openstreetmap-map-icons-classic,
- ${misc:Depends}
-Recommends: josm-plugins
-Description: Editor for OpenStreetMap
- JOSM is an editor for OpenStreetMap (OSM) written in Java.
- The current version supports stand alone GPX tracks, GPX track data
- from OSM database and existing nodes, line segments and metadata tags
- from the OSM database.
- .
- OpenStreetMap is a project aimed squarely at creating and providing
- free geographic data such as street maps to anyone who wants them.
- The project was started because most maps you think of as free actually
- have legal or technical restrictions on their use, holding back people
- from using them in creative, productive or unexpected ways.
diff --git a/debian/rules b/debian/rules
index e315c71..8f7a7ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,12 +21,6 @@ DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut
-d- -f1)
# Docs are already included in the jar file and can be accessed from within
josm.
#DEB_INSTALL_DOCS_ALL :=
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu echo yes),yes)
- BUILDDEPENDS=default-jdk (= 1.6)
-else
- BUILDDEPENDS=default-jdk (= 1:1.6)
-endif
-
%:
dh $@
@@ -42,13 +36,6 @@ override_dh_auto_install:
install -m 644 $(CURDIR)/debian/icons/josm-32.xpm
$(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm
install -m 644 $(CURDIR)/debian/josm.desktop
$(CURDIR)/debian/josm/usr/share/applications/josm.desktop
-override_dh_clean:
- dh_clean
-
- # handle distro-specific Build-Depends
- sed -e s/%distro_build_depends%/$(BUILDDEPENDS)/ \
- debian/control.in debian/control
-
get-orig-source:
dh_testdir
--
Java OpenStreetMap editor
___
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 branch, master, updated. debian/0.0.svn3514-2
The following commit has been merged in the master branch: commit 91ec66ba2d874f7264c296144cf4a9226115dfc7 Author: David Paleino da...@debian.org Date: Wed Oct 6 10:25:57 2010 +0200 debian/control: use openjdk-6-jdk instead of default-jdk, to ease sync to Ubuntu. diff --git a/debian/changelog b/debian/changelog index 41bce61..7fe7ac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ josm (0.0.svn3514-2) UNRELEASED; urgency=low * debian/patches/90-fix_version.patch added, fix inconsistency between code and upstream website. Thanks to Mario Izquierdo (Closes: #598920) + * debian/control: use openjdk-6-jdk instead of default-jdk, to ease +sync to Ubuntu. - -- David Paleino da...@debian.org Sun, 03 Oct 2010 11:37:39 +0200 + -- David Paleino da...@debian.org Wed, 06 Oct 2010 10:25:35 +0200 josm (0.0.svn3514-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c22e196..a90fff5 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: ant, debhelper (= 7.0.50~), gettext, - default-jdk (= 1:1.6), + openjdk-6-jdk, libgettext-commons-java (= 0.9.6), libmetadata-extractor-java, libgettext-ant-tasks-java, -- Java OpenStreetMap editor ___ 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 branch, master, updated. debian/0.0.svn3514-2
The following commit has been merged in the master branch: commit cee87176361d2546f39a0ac3d4cf125618d06e0c Author: David Paleino da...@debian.org Date: Wed Oct 6 10:40:51 2010 +0200 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 7fe7ac1..e0ec7b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn3514-2) UNRELEASED; urgency=low +josm (0.0.svn3514-2) unstable; urgency=low * debian/patches/90-fix_version.patch added, fix inconsistency between code and upstream website. Thanks to Mario Izquierdo @@ -6,7 +6,7 @@ josm (0.0.svn3514-2) UNRELEASED; urgency=low * debian/control: use openjdk-6-jdk instead of default-jdk, to ease sync to Ubuntu. - -- David Paleino da...@debian.org Wed, 06 Oct 2010 10:25:35 +0200 + -- David Paleino da...@debian.org Wed, 06 Oct 2010 10:34:40 +0200 josm (0.0.svn3514-1) unstable; urgency=low -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
