[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn26626+ds1-2-9-g198feba
The following commit has been merged in the master branch: commit e35ccd0e99c59405458a8b1ef9cee0485fafb5f2 Author: David Paleino da...@debian.org Date: Mon Dec 26 18:48:02 2011 +0100 debian/patches/10-i18n-build.xml removed -- i18n directory isn't being packaged anymore diff --git a/debian/changelog b/debian/changelog index a142e0c..ad46bff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ josm-plugins (0.0.svn27285+ds1-1) UNRELEASED; urgency=low * New upstream snapshot * Don't download i18n data anymore when creating new orig.tar.gz + * debian/patches/10-i18n-build.xml removed -- i18n directory isn't +being packaged anymore - -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:47:05 +0100 + -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:47:40 +0100 josm-plugins (0.0.svn26626+ds1-2) unstable; urgency=low diff --git a/debian/master.xml b/debian/master.xml index 579a2d4..2ada87c 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -5,7 +5,6 @@ property name=josm location=/usr/share/josm/josm.jar/ property name=plugin.dist.dirlocation=../dist/ property name=plugin.dir location=../ -property name=po.build.dir value=../build/ xmlproperty file=../svn-info.xml prefix=version keepRoot=false collapseAttributes=true/ @@ -13,18 +12,12 @@ target name=init mkdir dir=${josm.build.dir}/ mkdir dir=${plugin.dist.dir}/ -mkdir dir=${po.build.dir}/ /target target name=do_plugin !-- The data dir could have been deleted from GIT repository when empty -- mkdir dir=../${plugin.name}/data/ - !-- Build the translation files -- - ant dir=../i18n antfile=build.xml target=plugintrans - property name=path value=${plugin.name}/ - /ant - !-- Build the plugin -- ant dir=../${plugin.name} antfile=build.xml target=dist property name=plugin.jar value=${plugin.dist.dir}/${plugin.name}.jar/ @@ -89,6 +82,5 @@ ant dir=../surveyor antfile=build.xml target=clean/ delete dir=../tmp/ delete dir=${plugin.dist.dir}/ - delete dir=${po.build.dir}/ /target /project diff --git a/debian/patches/10-i18n-build.xml b/debian/patches/10-i18n-build.xml deleted file mode 100644 index a1607b6..000 --- a/debian/patches/10-i18n-build.xml +++ /dev/null @@ -1,24 +0,0 @@ -Index: josm-plugins/i18n/build.xml -=== josm-plugins.orig/i18n/build.xml 2011-09-10 11:45:34.0 +0200 -+++ josm-plugins/i18n/build.xml2011-09-10 11:56:31.0 +0200 -@@ -12,8 +12,8 @@ - property name=i18n.install.dir value=${josm.build.dir}/data/ - property name=po.build.dir value=${i18n.build.dir}/ - property name=ant.build.javac.target value=1.5/ --property name=gettexttasks.jar value=lib/gettext-ant-tasks-0.9.7.jar/ --property name=antcontrib.jar value=lib/ant-contrib-1.0b3.jar/ -+property name=gettexttasks.jar value=/usr/share/java/gettext-ant-tasks.jar/ -+property name=antcontrib.jar value=/usr/share/java/ant-contrib.jar/ - target name=init description=Loads the Ant gettext and contrib tasks - taskdef name=gettext-extract classname=org.xnap.commons.ant.gettext.GettextExtractKeysTask classpath=${gettexttasks.jar}/ - taskdef name=gettext-merge classname=org.xnap.commons.ant.gettext.GettextMergeKeysTask classpath=${gettexttasks.jar}/ -@@ -74,7 +74,7 @@ - arg line=i18n.pl ${i18n.install.dir}/ ${po.build.dir}/core/*.po/ - /exec - /target --target name=plugintrans -+target name=plugintrans depends=init - basename file=${path} property=dir/ - mkdir dir=${po.build.dir}/plugin_${dir}/ - gettext-extract keysFile=josm.pot poDirectory=${po.build.dir}/plugin_${dir} keywords=-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3 diff --git a/debian/patches/series b/debian/patches/series index ea565b8..fbb989b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 150_routing.diff -10-i18n-build.xml -- Plugins for JOSM ___ 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] josm-plugins branch, master, updated. debian/0.0.svn26626+ds1-2-9-g198feba
The following commit has been merged in the master branch: commit cdaa445a53916354d6bd7a6e530657371e5112ee Author: David Paleino da...@debian.org Date: Mon Dec 26 18:52:03 2011 +0100 Bump JOSM requirement to 4666-7 diff --git a/debian/changelog b/debian/changelog index ad46bff..62b4e6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ josm-plugins (0.0.svn27285+ds1-1) UNRELEASED; urgency=low * Don't download i18n data anymore when creating new orig.tar.gz * debian/patches/10-i18n-build.xml removed -- i18n directory isn't being packaged anymore + * Bump JOSM requirement to 4666-7 - -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:47:40 +0100 + -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:51:48 +0100 josm-plugins (0.0.svn26626+ds1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 6274e11..40605d8 100644 --- a/debian/control +++ b/debian/control @@ -12,13 +12,13 @@ Build-Depends: , ant-contrib , debhelper (= 8~) , default-jdk - , josm (= 0.0.svn4487) + , josm (= 0.0.svn4666) , libmetadata-extractor-java , liblog4j1.2-java , libjgrapht0.8-java , libgettext-ant-tasks-java , python -Build-Conflicts: josm (= 0.0.svn4488) +Build-Conflicts: josm (= 0.0.svn4668) Standards-Version: 3.9.2 Homepage: http://josm.openstreetmap.de/wiki/Plugins Vcs-Git: git://git.debian.org/pkg-osm/josm-plugins.git @@ -28,11 +28,11 @@ Package: josm-plugins Architecture: all Depends: ${misc:Depends} - , josm (= 0.0.svn4487) + , josm (= 0.0.svn4666) , libmetadata-extractor-java , liblog4j1.2-java , libjgrapht0.8-java -Breaks: josm (= 0.0.svn4488) +Breaks: josm (= 0.0.svn4668) Suggests: gpsd Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. -- Plugins for JOSM ___ 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] josm-plugins branch, master, updated. debian/0.0.svn26626+ds1-2-9-g198feba
The following commit has been merged in the master branch: commit 198feba0a8513e42111dcb74b56d64d36ab8ccc3 Author: David Paleino da...@debian.org Date: Mon Dec 26 18:57:40 2011 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 38a1317..f73056c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn27285+ds1-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn27285+ds1-1) unstable; urgency=low * New upstream snapshot * Don't download i18n data anymore when creating new orig.tar.gz @@ -6,7 +6,7 @@ josm-plugins (0.0.svn27285+ds1-1) UNRELEASED; urgency=low being packaged anymore * Bump JOSM requirement to 4666-7 (Closes: #648320) - -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:51:48 +0100 + -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:56:19 +0100 josm-plugins (0.0.svn26626+ds1-2) unstable; urgency=low -- Plugins for JOSM ___ 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] josm-plugins branch, master, updated. debian/0.0.svn26626+ds1-2-9-g198feba
The following commit has been merged in the master branch: commit 19694855f8c2c59a47ebe06a062ee6afcfb38b26 Author: David Paleino da...@debian.org Date: Mon Dec 26 18:43:30 2011 +0100 Don't download i18n data anymore when creating new orig.tar.gz diff --git a/debian/changelog b/debian/changelog index c485fc5..41cfa7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm-plugins (0.0.svn26626+ds1-3) UNRELEASED; urgency=low + + * Don't download i18n data anymore when creating new orig.tar.gz + + -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:43:08 +0100 + josm-plugins (0.0.svn26626+ds1-2) unstable; urgency=low * Bump JOSM requirement to 4487. diff --git a/debian/rules b/debian/rules index 1cf8cd6..97fbbae 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/josm/josm.jar:/usr/share/java/metadata-extractor.jar SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ -SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/ PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps measurement openvisible routing surveyor DATE := $(shell date +%Y%m%d) @@ -46,8 +45,6 @@ get-orig-source: rm -f ${DESTDIR}/$$plugin/data/*.lang; \ done svn info --xml http://svn.openstreetmap.org/applications/editors/josm/plugins/ ${DESTDIR}/svn-info.xml - @echo Fetching internalization data - svn export ${SVNI18NREPO} ${DESTDIR}/i18n @echo Removing jar files find ${DESTDIR} -name *.jar -exec rm -v {} \; @echo Building snapshot tarball -- Plugins for JOSM ___ 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] josm-plugins branch, master, updated. debian/0.0.svn26626+ds1-2-9-g198feba
The following commit has been merged in the master branch: commit 10f35abf757bb967faaca3f20fd16d7a60306ddb Author: David Paleino da...@debian.org Date: Mon Dec 26 18:47:32 2011 +0100 New upstream snapshot diff --git a/debian/changelog b/debian/changelog index 41cfa7e..a142e0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -josm-plugins (0.0.svn26626+ds1-3) UNRELEASED; urgency=low +josm-plugins (0.0.svn27285+ds1-1) UNRELEASED; urgency=low + * New upstream snapshot * Don't download i18n data anymore when creating new orig.tar.gz - -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:43:08 +0100 + -- David Paleino da...@debian.org Mon, 26 Dec 2011 18:47:05 +0100 josm-plugins (0.0.svn26626+ds1-2) unstable; urgency=low -- Plugins for JOSM ___ 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] josm-plugins annotated tag, debian/0.0.svn27285+ds1-1, created. debian/0.0.svn27285+ds1-1
The annotated tag, debian/0.0.svn27285+ds1-1 has been created at 6f5bdafdbcb32bc149c13f16d001a6a8121eaa43 (tag) tagging 198feba0a8513e42111dcb74b56d64d36ab8ccc3 (commit) replaces debian/0.0.svn26626+ds1-2 tagged by David Paleino on Mon Dec 26 19:03:44 2011 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk74twAACgkQ5qqQFxOSsXTDggCfXAvKNqBun8V9dsuQaLDlddCP ejIAnRfZqHOxEgJmSUIbRnL4rqOEaEqq =om+X -END PGP SIGNATURE- David Paleino (9): Don't download i18n data anymore when creating new orig.tar.gz Improved version handling Imported Upstream version 0.0.svn27285+ds1 Merge commit 'upstream/0.0.svn27285+ds1' New upstream snapshot debian/patches/10-i18n-build.xml removed -- i18n directory isn't being packaged anymore Bump JOSM requirement to 4666-7 Added bug number Releasing to sid --- -- Plugins for JOSM ___ 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] josm-plugins annotated tag, upstream/0.0.svn27285+ds1, created. upstream/0.0.svn27285+ds1
The annotated tag, upstream/0.0.svn27285+ds1 has been created at 7db87b6a3ca0f28e65a19347aad078d01d4b1a8f (tag) tagging b525f93598a3ac55e2cfe01f81a78e5125427765 (commit) replaces upstream/0.0.svn26626+ds1 tagged by David Paleino on Mon Dec 26 18:46:11 2011 +0100 - Shortlog Upstream version 0.0.svn27285+ds1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk74suMACgkQ5qqQFxOSsXRkFQCaA6fZlhkc0kWCWbXJRZFpEYqm +zoAoIvMuBPT72s8jSMXa/tU0Ri4oTlG =183g -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn27285+ds1 --- -- Plugins for JOSM ___ 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] josm-plugins branch, pristine-tar, updated. b23ff1cfb0758be3c0a9dd4d58cbae6e0871ed5f
The following commit has been merged in the pristine-tar branch: commit b23ff1cfb0758be3c0a9dd4d58cbae6e0871ed5f Author: David Paleino da...@debian.org Date: Mon Dec 26 18:46:11 2011 +0100 pristine-tar data for josm-plugins_0.0.svn27285+ds1.orig.tar.gz diff --git a/josm-plugins_0.0.svn27285+ds1.orig.tar.gz.delta b/josm-plugins_0.0.svn27285+ds1.orig.tar.gz.delta new file mode 100644 index 000..f6f8baf Binary files /dev/null and b/josm-plugins_0.0.svn27285+ds1.orig.tar.gz.delta differ diff --git a/josm-plugins_0.0.svn27285+ds1.orig.tar.gz.id b/josm-plugins_0.0.svn27285+ds1.orig.tar.gz.id new file mode 100644 index 000..00d73e4 --- /dev/null +++ b/josm-plugins_0.0.svn27285+ds1.orig.tar.gz.id @@ -0,0 +1 @@ +b525f93598a3ac55e2cfe01f81a78e5125427765 -- Plugins for JOSM ___ 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] josm branch, master, updated. debian/0.0.svn4666+dfsg1-1-5-g51570df
The following commit has been merged in the master branch: commit 3a964eac7ce5d212f0198a324f6e48bcdee91774 Merge: db4288ec67e282044a2102d925f3ab30fe479ed0 36667e35f942f0e4d9ff97f1db56d45fce6f6827 Author: David Paleino da...@debian.org Date: Mon Dec 26 19:05:25 2011 +0100 Merge commit 'upstream/0.0.svn4667+dfsg1' -- Editor for OpenStreetMap ___ 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] josm branch, master, updated. debian/0.0.svn4666+dfsg1-1-5-g51570df
The following commit has been merged in the master branch: commit 51570dff8b43cc8be67654493fbbcd07f0038166 Author: David Paleino da...@debian.org Date: Mon Dec 26 19:07:11 2011 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index bf88536..d426384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -josm (0.0.svn4667+dfsg1-1) UNRELEASED; urgency=low +josm (0.0.svn4667+dfsg1-1) unstable; urgency=low * New upstream snapshot * Fix jar generation: don't include .po files - -- David Paleino da...@debian.org Mon, 26 Dec 2011 19:06:28 +0100 + -- David Paleino da...@debian.org Mon, 26 Dec 2011 19:07:03 +0100 josm (0.0.svn4666+dfsg1-1) unstable; urgency=low -- Editor for OpenStreetMap ___ 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] josm branch, pristine-tar, updated. 53a342db784fd65c6639c2a5641bca37c0d44b8c
The following commit has been merged in the pristine-tar branch: commit 53a342db784fd65c6639c2a5641bca37c0d44b8c Author: David Paleino da...@debian.org Date: Mon Dec 26 19:05:24 2011 +0100 pristine-tar data for josm_0.0.svn4667+dfsg1.orig.tar.gz diff --git a/josm_0.0.svn4667+dfsg1.orig.tar.gz.delta b/josm_0.0.svn4667+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..870c785 Binary files /dev/null and b/josm_0.0.svn4667+dfsg1.orig.tar.gz.delta differ diff --git a/josm_0.0.svn4667+dfsg1.orig.tar.gz.id b/josm_0.0.svn4667+dfsg1.orig.tar.gz.id new file mode 100644 index 000..ac5ecc3 --- /dev/null +++ b/josm_0.0.svn4667+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +36667e35f942f0e4d9ff97f1db56d45fce6f6827 -- Editor for OpenStreetMap ___ 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] josm annotated tag, debian/0.0.svn4667+dfsg1-1, created. debian/0.0.svn4667+dfsg1-1
The annotated tag, debian/0.0.svn4667+dfsg1-1 has been created at 5628e81133fdf4f1a068c447471d107186de6ca0 (tag) tagging 51570dff8b43cc8be67654493fbbcd07f0038166 (commit) replaces debian/0.0.svn4666+dfsg1-1 tagged by David Paleino on Mon Dec 26 19:07:19 2011 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk74t9cACgkQ5qqQFxOSsXSRigCfQpntFzVtBbyYVmgHzECjbjJX OscAoI5zPpJYDa4mAGfqCg+e64JOtYyC =USKC -END PGP SIGNATURE- David Paleino (5): Fix jar generation: don't include .po files Imported Upstream version 0.0.svn4667+dfsg1 Merge commit 'upstream/0.0.svn4667+dfsg1' New upstream snapshot Releasing to sid --- -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits