[mate-polkit] 01/06: debian/{rules, watch}: Upstream sources are now DFSG-compliant. Simply obtain upstream tarball as is and don't repack anymore.

[Mike Gabriel]

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

sunweaver pushed a commit to branch debian/experimental
in repository mate-polkit.

commit a07281dd489b459fc93fcbb0edc2e0ec534319cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 15 16:30:37 2015 +0200

    debian/{rules,watch}: Upstream sources are now DFSG-compliant. Simply obtain upstream tarball as is and don't repack anymore.
---
 debian/rules | 30 ++----------------------------
 debian/watch |  1 -
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/rules b/debian/rules
index aa90a46..a407e1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,5 @@
 #!/usr/bin/make -f
 
-PKD   = $(word 1,$(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 = +dfsg1
-VER  ?= $(subst $(DTYPE),,$(UVER))
-
-
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -34,24 +27,5 @@ common-install-arch:: remove-cruft
 remove-cruft::
 	rm -fv debian/tmp/usr/lib/*/*.la
 
-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 --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 \
-	        docs/
-	$(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)"
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/watch b/debian/watch
index 4f577c2..f6de652 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg1// \
 http://git.mate-desktop.org/mate-polkit/ \
     snapshot/mate-polkit-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz

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