[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/1.0-30-gc34e3cb

2013-10-03 Thread Felix Natter
The following commit has been merged in the master branch:
commit 7b297cc23555a4efa4a98855ae391d550e768b83
Author: Felix Natter fnat...@gmx.net
Date:   Thu Oct 3 16:05:28 2013 +0200

update version in changelog after reimport

diff --git a/debian/changelog b/debian/changelog
index 018cfe7..8137b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jmapviewer (1.0-1) UNRELEASED; urgency=low
+jmapviewer (1.0+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #649226)
 

-- 
Java OpenStreetMap Tile Viewer

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/1.0-30-gc34e3cb

2013-10-03 Thread Felix Natter
The following commit has been merged in the master branch:
commit ba49fdd4bf125506dc4fc5fea32a2168e68320a6
Merge: c4a178ae84614283aad235e3c60e54c4d7b79645 
1aafe6022274e6cd5711d109b49e1d83c8fe7ec5
Author: Felix Natter fnat...@gmx.net
Date:   Thu Oct 3 16:00:53 2013 +0200

Merge tag 'upstream/1.0+dfsg1'

Upstream version 1.0+dfsg1


-- 
Java OpenStreetMap Tile Viewer

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/1.0-30-gc34e3cb

2013-10-03 Thread Felix Natter
The following commit has been merged in the master branch:
commit 1aafe6022274e6cd5711d109b49e1d83c8fe7ec5
Author: Felix Natter fnat...@gmx.net
Date:   Thu Oct 3 16:00:53 2013 +0200

Imported Upstream version 1.0+dfsg1

diff --git a/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png 
b/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
deleted file mode 100644
index ae4367e..000
Binary files a/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png and 
/dev/null differ

-- 
Java OpenStreetMap Tile Viewer

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/1.0-30-gc34e3cb

2013-10-03 Thread Felix Natter
The following commit has been merged in the master branch:
commit c34e3cbdee33c427f91dd1afa1e7ac920c153a64
Author: Felix Natter fnat...@gmx.net
Date:   Thu Oct 3 16:12:56 2013 +0200

add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..568a08b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+JMapViewer-1.0-Source.tar.gz is generated by 'get-orig-source' target.
+
++dfsg1 suffix has been added because bing_maps.png shall be removed at import:
+  gbp import-orig --filter bing_maps.png --filter-pristine-tar --pristine-tar 
-u1.0+dfsg1 \
+  ../JMapViewer-1.0-Source.tar.gz
\ No newline at end of file

-- 
Java OpenStreetMap Tile Viewer

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits