[triplea] 04/04: Merge branch '1.6.1.2+dfsg-debian'

[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 f177a9fb3c67c6fe0092da44c8f951f144203126
Merge: 1788a57 7bff427
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Jan 19 13:52:38 2014 -0500

    Merge branch '1.6.1.2+dfsg-debian'
    
    Conflicts:
    	debian/changelog
    	debian/rules

 debian/changelog               |  14 +++++++++++---
 debian/control                 |   4 ++--
 debian/rules                   |  31 +++++++++++++++++++++++++++++--
 debian/watch                   |   2 +-
 doc/images/project-support.jpg | Bin 3788 -> 0 bytes
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 38ec863,44a920f..e3a37a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- triplea (1.6.1.4-1) unstable; urgency=low
++triplea (1.6.1.4-1) UNRELEASED; urgency=low
 +
-   * Merge from experimental to unstable
 +  * New upstream release
 +
-  -- Scott Howard <showard at debian.org>  Tue, 07 May 2013 11:54:00 -0400
++ -- Scott Howard <showard at debian.org>  Sun, 19 Jan 2014 13:27:42 -0500
++
+ 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
  
diff --cc debian/rules
index dfec5ad,8cfffd4..66b061d
--- a/debian/rules
+++ b/debian/rules
@@@ -37,8 -37,32 +37,35 @@@ 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
  
 +override_dh_builddeb:
 +	dh_builddeb -- -Zxz -z9
 +
- get-orig-source:
- 	uscan --rename --repack --download-current-version
+ ## 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))
+ 	@
+ 
+ $(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)"

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