[SCM] blender/master: debian/rules: get-orig-source directive re-written

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3804039310f213dff0bc7bd8a0e1252d03879eb3
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Fri Jul 25 15:14:08 2014 +0200

    debian/rules: get-orig-source directive re-written
    
    Now it uses some parsing, uscan and
    perl repack scripts.
    
    Git-Dch: Short

diff --git a/debian/rules b/debian/rules
index 07f5e6f..1e5a8a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,14 @@
 #!/usr/bin/make -f
 
+export REPACK_SH=$(CURDIR)/debian/repack.sh
+
 INSTDIR = debian/tmp
 PY3VERS = $(shell py3versions -dv)
-
-# Adapted from http://wiki.debian.org/SandroTosi/Svn_get-orig-source
-PACKAGE = blender
-SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-SVN_REVISION := $(shell echo $(SRC_VERSION) | sed 's,^.*svn,,')
-TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.bz2
-UPSTREAM_SVN_REPOSITORY = "https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-.PHONY: get-orig-source
+SRC_VER = $(shell uscan --report | grep blender-.* | sed 's/^.*-//' | sed 's/\.tar.*$$//')
 
 get-orig-source:
-	rm -rf get-orig-source $(TARBALL)
-	mkdir get-orig-source
-	svn export -r $(SVN_REVISION) $(UPSTREAM_SVN_REPOSITORY) \
-	get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
-	BZIP2='--best --no-name' tar cjf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig
-	rm -rf get-orig-source
-	@echo "  "$(TARBALL)" created; move it to the right destination to build the package"
+	uscan --force-download --repack --compression xz
+	$(REPACK_SH) --upstream-version $(SRC_VER) ../blender_$(SRC_VER).orig.tar.xz
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

-- 
blender packaging