[josm] 01/01: Disable FTBFS causing translation in d/rules instead of removing it in d/clean.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit b6d254a729bcdf6e04a28310296c63a9f4e48547
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 13 16:15:38 2014 +0100

    Disable FTBFS causing translation in d/rules instead of removing it in d/clean.
---
 debian/changelog | 2 ++
 debian/clean     | 3 ---
 debian/rules     | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4c2fc9..931ae8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ josm (0.0.svn7778+dfsg1-1~exp2) UNRELEASED; urgency=medium
   * Add alternative dependency on minimum required JRE.
   * Update Vcs-* fields to use pkg-grass instead of pkg-osm,
     and cgit instead of gitweb.
+  * Disable FTBFS causing translation in d/rules instead of removing it
+    in d/clean.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 13 Dec 2014 15:28:13 +0100
 
diff --git a/debian/clean b/debian/clean
index 13b51b4..0de62c4 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,6 +1,3 @@
 data/*.lang
 src/org/openstreetmap/josm/data/imagery/types/*
 src/org/w3/_2001/xmlschema/*
-
-# can't build this now
-i18n/po/ca at valencia.po
diff --git a/debian/rules b/debian/rules
index b9708ac..0d717df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,14 @@ IMGSTYLES_DIR := $(CURDIR)/debian/josm/usr/share/josm/images/styles
 	dh $@
 
 override_dh_auto_build:
+	# Move translation causing build failure out of the way
+	mv i18n/po/ca at valencia.po .
+
 	xjc -d src/ data_nodist/wms-cache.xsd
 	dh_auto_build -- -Ddebian.version=${DEB_VERSION} dist
 
+	mv ca at valencia.po i18n/po/
+
 override_dh_auto_install:
 	dh_auto_install
 	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git