[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5759+dfsg1-1-11-ge8bb825

[Mònica Ramírez Arceda]

The following commit has been merged in the master branch:
commit 2d8976896029f0ad04b5173beb519ee49209dd8d
Author: Mònica Ramírez Arceda <monica at debian.org>
Date:   Sun Sep 1 13:13:47 2013 +0200

    Remove empty directory

diff --git a/debian/changelog b/debian/changelog
index 5dd3bcb..c538712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ josm (0.0.svn6115+dfsg1-1) UNRELEASED; urgency=low
   [ Mònica Ramírez Arceda ]
   * New tested snapshot (Closes: #708948).
   * debian/control: add myself to Uploaders.
+  * debian/rules: remove empty /usr/share/josm/images/styles directory.
 
  -- Mònica Ramírez Arceda <monica at debian.org>  Sun, 01 Sep 2013 10:32:29 +0200
 
diff --git a/debian/rules b/debian/rules
index a0ffb48..9c25b3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ DESTTGZ := ../tarballs/josm_${VERSION}+dfsg1.orig.tar.gz
 DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
 
+IMGSTYLES_DIR := $(CURDIR)/debian/josm/usr/share/josm/images/styles
+
 # Docs are already included in the jar file and can be accessed from within josm.
 #DEB_INSTALL_DOCS_ALL :=
 
@@ -44,6 +46,8 @@ override_dh_install:
 	rm -rf $(CURDIR)/debian/josm/usr/share/josm/data/*.lang
 	# remove executable bit
 	chmod a-x $(CURDIR)/debian/josm/usr/share/josm/data/defaultpresets.xml
+	# remove empty directory
+	[ -z "$(ls ${IMGSTYLES_DIR} 2> /dev/null)" ] && rm -rf ${IMGSTYLES_DIR}
 
 get-orig-source:
 	dh_testdir

-- 
Editor for OpenStreetMap