[scummvm] 04/05: watch to v4; use copyright/Files-Exclided

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository scummvm.

commit 1be850f
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Mar 4 12:31:41 2016

    watch to v4; use copyright/Files-Exclided
---
 debian/copyright |  5 +++++
 debian/rules     | 21 +--------------------
 debian/watch     | 13 ++++++++-----
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d0a4446..b543bdb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,11 @@ Comment:
  It was adopted by Tore Anderson <tore at linpro.no> the 4th Oct 2002,
  then adopted by David Weinehall <tao at debian.org> the 30th Jan 2006,
  then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm at debian.org>
+Files-Excluded:
+    gui/themes/fonts/topaz
+    gui/themes/fonts/Arial*
+    */*/*/*/*.o*
+    */*/*/*.dll
 
 Files: *
 Copyright: 2001-2014 The ScummVM Project
diff --git a/debian/rules b/debian/rules
index 37cf858..8726893 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,13 +49,10 @@ override_dh_strip:
 override_dh_gencontrol:
 	dh_gencontrol -- -Vmy:Built-Using="$(foreach pkg,fonts-freefont-ttf,$(word 2,$(shell dpkg --status $(pkg) | grep Source)) (=$(word 2,$(shell dpkg --status $(pkg) | grep Version))),)"
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
 # get-orig-source
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
 DTYPE := +dfsg
 .PHONY: get-orig-source
 get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
@@ -64,19 +61,3 @@ get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
 $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	@echo "# Downloading..."
 	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
-	@echo "# Extracting..."
-	mkdir $(PKG)-$(VER) \
-        && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
-        || $(RM) -r $(PKG)-$(VER)
-	@echo "# Clean-up..."
-	cd $(PKG)-$(VER) \
-        && $(RM) -r -v \
-             .*DS_Store                \
-             gui/themes/fonts/topaz    \
-             gui/themes/fonts/Arial*   \
-             */*/*/*/*.o*              \
-             */*/*/*.dll
-	@echo "# Packing..."
-	find -L "$(PKG)-$(VER)" -xdev -type f -print \
-        | sort | XZ_OPT="-7v" 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 0cf8ff2..a4c9193 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,10 @@
 # uscan(1) configuration file.
-# Use `debian/rules get-orig-source` to generate DFSG-repackaged orig.tar.
+version=4
 
-version=3
-
-opts="dversionmangle=s/\+dfsg//" \
-http://sf.net/scummvm/scummvm-([0-9.]+)\.tar\.(?:xz|bz2|gz)
+## Redirector http://qa.debian.org/watch/sf.php/scummvm/
+opts="\
+pgpmode=none,\
+repacksuffix=+dfsg,\
+repack,compression=xz,\
+dversionmangle=s/\+dfsg\d*//,\
+"  http://sf.net/scummvm/scummvm-([0-9.]+)\.tar\.(?:xz|bz2|gz)

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