[SCM] vdr-plugin-streamdev packaging repository branch, master, updated. debian/0.5.1+git20111211+git20120325-2-4-gcbebdb7

[etobi]

The following commit has been merged in the master branch:
commit 9ccaab556cafdb1206be541b10cfcb13e71d743c
Author: etobi <git at e-tobi.net>
Date:   Wed May 30 18:36:40 2012 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 62662fd..1a6d46d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-streamdev (0.6.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 30 May 2012 18:34:19 +0200
+
 vdr-plugin-streamdev (0.5.1+git20111211+git20120325-2) unstable; urgency=low
 
   * Build-depend on vdr-dev (>= 1.7.27)
diff --git a/debian/get-vcs-snapshot.sh b/debian/get-vcs-snapshot.sh
index fa726c0..c9702a0 100644
--- a/debian/get-vcs-snapshot.sh
+++ b/debian/get-vcs-snapshot.sh
@@ -2,17 +2,18 @@ echo Downloading latest from git repository...
 set -e
 
 DEB_SOURCE_PACKAGE=`egrep '^Source: ' debian/control | cut -f 2 -d ' '`
+VERSION_UPSTREAM=`dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1 | sed -r 's/(.*)\+git.*/\1/'`
 VERSION_DATE=`/bin/date --utc +%0Y%0m%0d`
-DEB_UPSTREAM_VERSION=`dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'`
-VERSION_FULL="${DEB_UPSTREAM_VERSION}+git${VERSION_DATE}"
+VERSION_FULL="${VERSION_UPSTREAM}+git${VERSION_DATE}"
 
 git clone --depth 1 git://projects.vdr-developer.org/${DEB_SOURCE_PACKAGE}.git
 
 cd ${DEB_SOURCE_PACKAGE}
-GIT_SHA=`git show --pretty=format:"%h" --quiet || true`
+GIT_SHA=`git show --pretty=format:"%h" --quiet | head -1 || true`
 cd ..
 
 tar --exclude=.git -czf "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz" ${DEB_SOURCE_PACKAGE}
-rm -rf ${DEB_SOURCE_PACKAGE}
-git-import-orig --pristine-tar "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz"
+
 dch -v "$VERSION_FULL-1" "New Upstream Snapshot (commit $GIT_SHA)"
+
+rm -rf ${DEB_SOURCE_PACKAGE}

-- 
vdr-plugin-streamdev packaging repository