[SCM] ardour/master: Make get-orig-source similar to jackd2

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 415aae34b6bb1fc96201b5201aad26b2d4aa0ae7
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sat Jun 27 21:20:20 2015 +0200

    Make get-orig-source similar to jackd2
    
    Updating the source package now follows the same approach as jackd2:
    
      ardour3$ DEB_UPSTREAM_TARBALL_VERSION=4.1 ./debian/rules get-orig-source
      git-import-orig ../tarballs/ardour3_4.1~dfsg.orig.tar.gz

diff --git a/debian/rules b/debian/rules
index 1826796..d362baa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,20 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/
 # ignore oddly packaged bzip2 archive to not upset dpkg
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./waf|\./debian/(changelog|copyright(|_hints|_newhints))$
 
+# Set tag to full 40 char git tag for git snapshot release
+tag = $(DEB_UPSTREAM_TARBALL_VERSION)
+DEB_UPSTREAM_URL = https://github.com/Ardour/ardour/archive
+DEB_UPSTREAM_TARBALL_BASENAME = $(tag)
+DEB_UPSTREAM_TARBALL_SRCDIR = ardour-$(tag)
+
+# Exclude these files from the Debian version
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./.git*
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./MSVCvst_scan
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./MSVCardour3
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./icons/win32/resource
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./icons/win32/msvc_resources.rc.in
+
 DIST_TARGET = none
 ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
 	DIST_TARGET = i686
@@ -150,18 +164,8 @@ ifeq (Ubuntu,$(shell dpkg-vendor --query Vendor))
 CDBS_RECOMMENDS_ALL = firefox | www-browser
 endif
 
-get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version --destdir=.
-	tar -xf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz
-	mv ardour-$(UPSTREAM_VERSION) $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/waf
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.git
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.gitignore
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCvst_scan
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCardour3
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/resource
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/msvc_resources.rc.in
-	XZ_OPT=-9 tar cJf ../$(PKG)_$(UPSTREAM_VERSION)~$(DFSG).orig.tar.xz $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)
-	rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)
-	rm -rf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz
-
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./.git*
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./MSVC**
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./msvc*
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./icons/win32/**

-- 
ardour Debian packaging