[triplea] 01/04: Merge from experimental to unstable. * Merge from experimental to unstable. * Debian S-V no changes * updated Vcs-Git. * Remove project-support.jpg from package, non-free file.

[Scott Sheridan Howard]

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

showard pushed a commit to branch master
in repository triplea.

commit ad7d1f9b1aa502e6b78efe9cc95ada97250dcda1
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Jan 19 11:34:13 2014 -0500

    Merge from experimental to unstable.
    * Merge from experimental to unstable.
    * Debian S-V no changes
    * updated Vcs-Git.
    * Remove project-support.jpg from package, non-free file.
---
 debian/changelog |  9 +++++++++
 debian/control   |  4 ++--
 debian/rules     | 29 +++++++++++++++++++++++++++--
 debian/watch     |  2 +-
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56f5af1..44a920f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+triplea (1.6.1.2+dfsg-1) unstable; urgency=low
+
+  * Merge from experimental to unstable.
+  * Debian S-V no changes
+  * updated Vcs-Git.
+  * Remove project-support.jpg from package, non-free file.
+
+ -- Scott Howard <showard at debian.org>  Sun, 19 Jan 2014 10:38:42 -0500
+
 triplea (1.6.1.2-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index eadcab3..b484fae 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Scott Howard <showard at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper (>= 0.37),
  ant, libcommons-httpclient-java, libcommons-logging-java,
  libcommons-codec-java, junit, libgnumail-java, imagemagick
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://triplea.sourceforge.net
-Vcs-Git: git://anonscm.debian.org/pkg-java/triplea.git
+Vcs-Git: git://anonscm.debian.org/git/pkg-java/triplea.git
 Vcs-browser: http://anonscm.debian.org/gitweb/?p=pkg-java/triplea.git
 
 Package: triplea
diff --git a/debian/rules b/debian/rules
index b4717e0..8cfffd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,32 @@ override_dh_auto_configure:
 	cp icons/triplea_icon.png debian/icons/256x256/apps/triplea.png
 	convert icons/triplea_icon.png -resize 32x32 debian/triplea.xpm
 
+## http://wiki.debian.org/onlyjob/get-orig-source
+PKD   = $(abspath $(dir $(MAKEFILE_LIST)))
+PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+DTYPE = +dfsg
+VER  ?= $(subst $(DTYPE),,$(UVER))
 
+.PHONY: get-orig-source
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+	@
 
-get-orig-source:
-	uscan --rename --repack --download-current-version
+$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
+	@echo "# Downloading..."
+	uscan --noconf --verbose --rename --repack --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
+	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
+	@echo "# Extracting..."
+	mkdir $(PKG)-$(VER) \
+	&& tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
+	|| $(RM) -r $(PKG)-$(VER)
+	@echo "# Cleaning-up..."
+	cd $(PKG)-$(VER) \
+	&& find . -depth -type d -name 'windows' -exec $(RM) -r {} \; -printf 'removed %p\n' \
+	&& $(RM) -r -v \
+	doc/images/project-support.jpg
+	#$(RM) -v $(PKG)_$(VER).orig.tar.*
+	@echo "# Packing..."
+	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
+	| XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+	&& $(RM) -r "$(PKG)-$(VER)"
diff --git a/debian/watch b/debian/watch
index b3b8460..675d660 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/_/./g \
+opts="uversionmangle=s/_/./g,dversionmangle=s/\+dfsg//g" \
 http://sf.net/triplea/triplea_(.+)_source_code_only\.zip debian jh_repack

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