[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4487+dfsg2-2-11-gde5e00f

[David Paleino]

The following commit has been merged in the master branch:
commit 2f6e7c02fdccfe6667898d024f19977e59ac2742
Author: David Paleino <dapal at debian.org>
Date:   Sat Nov 5 18:09:04 2011 +0100

    Fix get-orig-source target to grab translations (Closes: #647721)

diff --git a/debian/changelog b/debian/changelog
index e40f636..fbe076d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn4550+dfsg1-2) UNRELEASED; urgency=low
+
+  * Fix get-orig-source target to grab translations (Closes: #647721)
+
+ -- David Paleino <dapal at debian.org>  Sat, 05 Nov 2011 18:08:22 +0100
+
 josm (0.0.svn4550+dfsg1-1) unstable; urgency=low
 
   * New upstream version (Closes: #647634)
diff --git a/debian/rules b/debian/rules
index 3e374b2..d007bfc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ else
 VERSION := 0.0.0.${DATE}
 endif
 DESTDIR := ../tarballs/josm-${VERSION}
-DESTTGZ := ../tarballs/josm_${VERSION}+dfsg1.orig.tar.gz
+DESTTGZ := ../tarballs/josm_${VERSION}+dfsg2.orig.tar.gz
 
 DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
@@ -52,6 +52,9 @@ get-orig-source:
 	svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION
 	@echo Fetching internalization data
 	svn export ${SVNI18NREPO} ${DESTDIR}/i18n
+	@echo Downloading translations from Launchpad
+	bzr export -v ${DESTDIR}/i18n/po/ lp:~openstreetmap/josm/josm_trans/
+	mv ${DESTDIR}/i18n/po/josm/* ${DESTDIR}/i18n/po/
 	@echo Removing jar files
 	find ${DESTDIR} -name "*.jar" -exec rm -v {} \;
 	@echo Removing images_nodist

-- 
Editor for OpenStreetMap