[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/1.0+dfsg1-42-g41d21f0
The following commit has been merged in the master branch: commit 613fff0333fc9fd4605397f8def0451d65c436d7 Author: Felix Natter fnat...@gmx.net Date: Sat Oct 12 09:51:03 2013 +0200 update debian/copyright diff --git a/debian/copyright b/debian/copyright index 9754e9d..eb0e86a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: JMapViewer -Source: http://svn.openstreetmap.org/applications/viewer/jmapviewer +Source: http://svn.openstreetmap.org/applications/viewer/jmapviewer Files: * Copyright: 2008 Jan Peter Stotz and others License: GPL-2+ Files: debian/* -Copyright: 2011 Andrew Harvey andrew.harv...@gmail.com +Copyright: 2011-2013 Andrew Harvey andrew.harv...@gmail.com + 2013 Felix Natter fnat...@gmx.net License: BSD-2-clause or GPL-2+ License: BSD-2-clause -- 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+dfsg1-42-g41d21f0
The following commit has been merged in the master branch: commit 7e7497287cad90556ed668837d017b5ed44b980b Author: Felix Natter fnat...@gmx.net Date: Sat Oct 12 09:54:35 2013 +0200 put 'unstable' in changelog diff --git a/debian/changelog b/debian/changelog index 69e7e0f..b753ec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jmapviewer (1.02+dfsg1-1) UNRELEASED; urgency=low +jmapviewer (1.02+dfsg1-1) unstable; 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+dfsg1-42-g41d21f0
The following commit has been merged in the master branch:
commit 64ae0c60ed2818a71f28f63c0b16d07985634a53
Author: Felix Natter fnat...@gmx.net
Date: Sat Oct 12 09:46:54 2013 +0200
import 1.02, remove patches that have been applied upstream
diff --git a/debian/changelog b/debian/changelog
index 8137b5c..69e7e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-jmapviewer (1.0+dfsg1-1) UNRELEASED; urgency=low
+jmapviewer (1.02+dfsg1-1) UNRELEASED; urgency=low
* Initial release. (Closes: #649226)
- -- Andrew Harvey andrew.harv...@gmail.com Fri, 15 Mar 2013 19:17:49 +1100
+ -- Felix Natter fnat...@gmx.net Sat, 12 Oct 2013 09:37:49 +0200
diff --git a/debian/control b/debian/control
index fdd6b07..25681a7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: extra
Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
Uploaders:
- Andrew Harvey andrew.harv...@gmail.com
+ Felix Natter fnat...@gmx.net
Build-Depends:
ant,
debhelper (= 9~),
diff --git a/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
b/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
deleted file mode 100644
index dd5a518..000
--- a/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix error in upstream build.xml: _${svnReleaseVersion} in Class-Path value
a/build.xml
-+++ b/build.xml
-@@ -50,7 +50,7 @@
- jar destfile=JMapViewer_Demo.jar
filesetmanifest=mergewithoutmain
- manifest
- attribute name=Main-Class
value=org.openstreetmap.gui.jmapviewer.Demo /
-- attribute name=Class-Path
value=JMapViewer_${svnReleaseVersion}.jar /
-+ attribute name=Class-Path
value=JMapViewer.jar /
- /manifest
- /jar
- /target
diff --git a/debian/patches/04-javac-encoding.patch
b/debian/patches/04-javac-encoding.patch
deleted file mode 100644
index 57fc46c..000
--- a/debian/patches/04-javac-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-set the encoding for the source files in order to allow building with LANG=C
a/build.xml
-+++ b/build.xml
-@@ -14,7 +14,7 @@
- /target
-
- target name=build
-- javac srcdir=src destdir=bin source=1.6 target=1.6
debug=true includeantruntime=false
-+ javac srcdir=src destdir=bin source=1.6 target=1.6
debug=true includeantruntime=false encoding=UTF-8
- include name=org/openstreetmap/gui/jmapviewer/** /
- /javac
-
diff --git a/debian/patches/series b/debian/patches/series
index f5ebedd..32e8c24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
01-build_less.patch
-02-remove-svn-prop-from-create_run_jar.patch
03-use-installed-library-in-demo.patch
-04-javac-encoding.patch
diff --git a/debian/rules b/debian/rules
index 0e2e4d5..aa6747a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
# DESTDIR := ../tarballs/jmapviewer-${VER}
# DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
-VER=1.0
+VER=1.02
%:
dh $@
--
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, pristine-tar, updated. 91826df5da4354025012ffa99d584bdce48489f3
The following commit has been merged in the pristine-tar branch: commit 91826df5da4354025012ffa99d584bdce48489f3 Author: Felix Natter fnat...@gmx.net Date: Sat Oct 12 09:29:33 2013 +0200 pristine-tar data for jmapviewer_1.02+dfsg1.orig.tar.gz diff --git a/jmapviewer_1.02+dfsg1.orig.tar.gz.delta b/jmapviewer_1.02+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..99a9c48 Binary files /dev/null and b/jmapviewer_1.02+dfsg1.orig.tar.gz.delta differ diff --git a/jmapviewer_1.02+dfsg1.orig.tar.gz.id b/jmapviewer_1.02+dfsg1.orig.tar.gz.id new file mode 100644 index 000..5f7e069 --- /dev/null +++ b/jmapviewer_1.02+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +7b8d29cfda2a43756d0a3c19515e308d35c4 -- 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 annotated tag, upstream/1.02+dfsg1, created. upstream/1.02+dfsg1
The annotated tag, upstream/1.02+dfsg1 has been created at 4d6e2989a6cab322a917de847d771ebdb99c0bf0 (tag) tagging 3bff28956bff8b7a981aea3d6a73520c758eb968 (commit) replaces upstream/1.0+dfsg1 tagged by Felix Natter on Sat Oct 12 09:29:33 2013 +0200 - Shortlog Upstream version 1.02+dfsg1 Felix Natter (1): Imported Upstream version 1.02+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/0.0+svn29245+dfsg-27-gc4a178a
The following commit has been merged in the master branch: commit 9a76cc594c2116dedfdc7ed61f213eb37c285ca2 Author: Felix Natter fnat...@gmx.net Date: Thu Oct 3 12:11:56 2013 +0200 add .pc to .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..4ecbc3e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.pc + -- 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/0.0+svn29245+dfsg-27-gc4a178a
The following commit has been merged in the master branch:
commit e7f0fbbbc19cb29684d25877d5d0455085895f85
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 12:39:49 2013 +0200
call ant clean in clean target
diff --git a/debian/rules b/debian/rules
index b774566..e6090f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
override_dh_auto_clean:
rm -rf $(CURDIR)/bin/*
+ dh_auto_clean
override_dh_auto_install:
dh_auto_install
--
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/0.0+svn29245+dfsg-27-gc4a178a
The following commit has been merged in the master branch: commit 1cb23f4d8b933b533cc731c2fb4919b063dae5dd Merge: 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b b7ff9e7493c0a51e6ba590beec934602845b3df4 Author: Felix Natter fnat...@gmx.net Date: Thu Oct 3 11:59:21 2013 +0200 Merge tag 'upstream/1.0' Upstream version 1.0 -- 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/0.0+svn29245+dfsg-27-gc4a178a
The following commit has been merged in the master branch:
commit c4a178ae84614283aad235e3c60e54c4d7b79645
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 12:44:39 2013 +0200
remove svn stuff from debian/rules
diff --git a/debian/rules b/debian/rules
index e6090f4..69fa67d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
# -*- makefile -*-
+# SVNREPO := http://svn.openstreetmap.org/applications/viewer/jmapviewer/
-SVNREPO := http://svn.openstreetmap.org/applications/viewer/jmapviewer/
+# SVNREV=$(shell dpkg-parsechangelog | sed -rne 's,^Version:
.*[+~]svn([0-9]+).*,\1,p')
+# VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-SVNREV=$(shell dpkg-parsechangelog | sed -rne 's,^Version:
.*[+~]svn([0-9]+).*,\1,p')
-VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+# DESTDIR := ../tarballs/jmapviewer-${VER}
+# DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
-DESTDIR := ../tarballs/jmapviewer-${VER}
-DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
+VER=1.0
%:
dh $@
@@ -19,23 +20,11 @@ override_dh_auto_clean:
override_dh_auto_install:
dh_auto_install
- install -m 644 $(CURDIR)/JMapViewer.jar
$(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${SVNREV}.jar
- dh_link usr/share/java/jmapviewer-${SVNREV}.jar
usr/share/java/jmapviewer.jar
+ install -m 644 $(CURDIR)/JMapViewer.jar
$(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${VER}.jar
+ dh_link usr/share/java/jmapviewer-${VER}.jar
usr/share/java/jmapviewer.jar
install -m 644 $(CURDIR)/JMapViewer_Demo.jar
$(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
install -m 755 $(CURDIR)/debian/jmapviewer_demo.sh
$(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
-# get-orig-source:
-# #dh_testdir
-# test -d ../tarballs/. || mkdir -p ../tarballs
-# @echo Downloading jmapviewer from ${SVNREPO}
-# svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
-# @echo Removing non-source files
-# rm -rf ${DESTDIR}/releases/
-# rm ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
-# tar -cz --owner root --group root --mode a+rX -f ${DESTTGZ} -C `dirname
${DESTDIR}` `basename ${DESTDIR}`
-# @echo Cleaning up
-# rm -rf ${DESTDIR}
-
get-orig-source:
uscan --download --repack --destdir ..
--
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/0.0+svn29245+dfsg-27-gc4a178a
The following commit has been merged in the master branch: commit 9fccaced8ceec04a39bf14cfdfe81337081b83a6 Author: Felix Natter fnat...@gmx.net Date: Thu Oct 3 12:15:59 2013 +0200 adapt changelog for 1.0 diff --git a/debian/changelog b/debian/changelog index 3a18f15..018cfe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jmapviewer (0.0+svn29245+dfsg-1) UNRELEASED; urgency=low +jmapviewer (1.0-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/0.0+svn29245+dfsg-27-gc4a178a
The following commit has been merged in the master branch:
commit 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 11:54:03 2013 +0200
fix watch file / get-orig-source target
diff --git a/debian/rules b/debian/rules
index 04c075b..b774566 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,16 +23,19 @@ override_dh_auto_install:
install -m 644 $(CURDIR)/JMapViewer_Demo.jar
$(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
install -m 755 $(CURDIR)/debian/jmapviewer_demo.sh
$(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
+# get-orig-source:
+# #dh_testdir
+# test -d ../tarballs/. || mkdir -p ../tarballs
+# @echo Downloading jmapviewer from ${SVNREPO}
+# svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
+# @echo Removing non-source files
+# rm -rf ${DESTDIR}/releases/
+# rm ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
+# tar -cz --owner root --group root --mode a+rX -f ${DESTTGZ} -C `dirname
${DESTDIR}` `basename ${DESTDIR}`
+# @echo Cleaning up
+# rm -rf ${DESTDIR}
+
get-orig-source:
-# dh_testdir
- test -d ../tarballs/. || mkdir -p ../tarballs
- @echo Downloading jmapviewer from ${SVNREPO}
- svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
- @echo Removing non-source files
- rm -rf ${DESTDIR}/releases/
- rm ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
- tar -cz --owner root --group root --mode a+rX -f ${DESTTGZ} -C `dirname
${DESTDIR}` `basename ${DESTDIR}`
- @echo Cleaning up
- rm -rf ${DESTDIR}
+ uscan --download --repack --destdir ..
.PHONY: override_dh_auto_clean override_dh_auto_install
diff --git a/debian/watch b/debian/watch
index 8fd4dbc..2a1835f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,4 @@
-# This package pulls new versions directly from upstream vcs.
-# Access is via,
-# http://svn.openstreetmap.org/applications/viewer/jmapviewer/
+version=3
+opts=dversionmangle=s/\+dfsg\d*// \
+
http://svn.openstreetmap.org/applications/viewer/jmapviewer/releases/\d+(?:\.\d+(?:\.\d+)?)?/JMapViewer-(\d+(?:\.\d+(?:\.\d+)?)?)-Source\.zip
-# Upstream doesn't tag their vcs with releases and the releases it produces in
-# the releases directory are binary only, not source releases.
--
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, pristine-tar, updated. f44e599bfcf89a4818d087cde1607717e789a42d
The following commit has been merged in the pristine-tar branch: commit f44e599bfcf89a4818d087cde1607717e789a42d Author: Felix Natter fnat...@gmx.net Date: Thu Oct 3 11:59:21 2013 +0200 pristine-tar data for jmapviewer_1.0.orig.tar.gz diff --git a/jmapviewer_1.0.orig.tar.gz.delta b/jmapviewer_1.0.orig.tar.gz.delta new file mode 100644 index 000..44d6c9c Binary files /dev/null and b/jmapviewer_1.0.orig.tar.gz.delta differ diff --git a/jmapviewer_1.0.orig.tar.gz.id b/jmapviewer_1.0.orig.tar.gz.id new file mode 100644 index 000..3c02b3f --- /dev/null +++ b/jmapviewer_1.0.orig.tar.gz.id @@ -0,0 +1 @@ +a8f6eb388a2218af55e93a205345f43acb163f17 -- 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
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
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
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
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
[Pkg-osm-commits] [SCM] jmapviewer annotated tag, upstream/1.0+dfsg1, created. upstream/1.0+dfsg1
The annotated tag, upstream/1.0+dfsg1 has been created at 1f8502776ee606180f05cf991c3740a89fe86a3b (tag) tagging 1aafe6022274e6cd5711d109b49e1d83c8fe7ec5 (commit) replaces upstream/1.0 tagged by Felix Natter on Thu Oct 3 16:00:53 2013 +0200 - Shortlog Upstream version 1.0+dfsg1 Felix Natter (1): Imported 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+dfsg1-31-gfeb2bcd
The following commit has been merged in the master branch: commit feb2bcda9e7ea66ce8b1c5c39c4738f644d4a917 Author: Felix Natter fnat...@gmx.net Date: Thu Oct 3 16:54:58 2013 +0200 move no-upstream-changelog override to binary lintian-overrides file diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 3cde723..e69de29 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,2 +0,0 @@ -# Upstream don't provide a changelog -jmapviewer source: no-upstream-changelog -- 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+dfsg1-31-gfeb2bcd
The following commit has been merged in the master branch: commit 93650c2d07327ad68ce677b6aee1ecbd845c048b Author: Felix Natter fnat...@gmx.net Date: Thu Oct 3 16:52:53 2013 +0200 override two lintian binary warnings diff --git a/debian/jmapviewer.lintian-overrides b/debian/jmapviewer.lintian-overrides new file mode 100644 index 000..b2b4575 --- /dev/null +++ b/debian/jmapviewer.lintian-overrides @@ -0,0 +1,4 @@ +# this is a convenience jar for /usr/bin/jmapviewer which only contains Main-Class and Class-Path +jmapviewer binary: codeless-jar usr/share/jmapviewer/JMapViewer_Demo.jar + +jmapviewer binary: no-upstream-changelog -- 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+dfsg1-33-gbb812a3
The following commit has been merged in the master branch:
commit bb812a323f17c8b70ad0a069222b1fb4f36abce0
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 17:12:13 2013 +0200
add patch description to 02-remove-svn-prop-from-create_run_jar.patch
diff --git a/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
b/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
index aa9fa51..dd5a518 100644
--- a/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
+++ b/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
@@ -1,3 +1,4 @@
+fix error in upstream build.xml: _${svnReleaseVersion} in Class-Path value
--- a/build.xml
+++ b/build.xml
@@ -50,7 +50,7 @@
--
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
