[SCM] FFmpeg packaging branch, master, updated. debian/0.svn20090303-1-28-geb4e01e

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bbe8f8e5b3cdb1ffa147113656ee873ca4e08b09
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:04:11 2009 +0200

    fixup get-orig-source rules in debian/rules
    
    with the new versioning scheme, the regex needed to be adjusted. While
    doing that, a minor sanity check is added so that mistakes get detected
    earlier here.
    
    (also, the debian/get-orig-source.sh invocation lacked a ' ' to work)

diff --git a/debian/rules b/debian/rules
index 5e6361b..1ca9861 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,13 @@ EPOCH=3:
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
-SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
+SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+[+.]svn([0-9]+)$$/\1/p')
 SHLIBS_VERSION := $(EPOCH)0.svn20090303-1
 
+ifeq ($(SVN_VERSION),)
+$(error UPSTREAM_VERSION: $(UPSTREAM_VERSION) - but SVN_VERSION is empty! - check debian/rules)
+endif
+
 LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 # we don't need to strip if we are not building the package ffmpeg-debian
@@ -90,7 +94,7 @@ get-orig-source:
 	dh_testdir
 	# strip patented code
 	chmod +x debian/strip.sh
-	sh debian/get-orig-source.sh -d$(SVN_VERSION)
+	sh debian/get-orig-source.sh -d $(SVN_VERSION)
 
 # The trailing newline is important!
 define install_flavor

-- 
FFmpeg packaging