[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-2-12-gcd842cb

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3769afb6854e32af5bb8d6c7da74d6b567b37e2b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:38:54 2009 +0200

    rename the source package from 'ffmpeg-debian' -> 'ffmpeg'

diff --git a/debian/changelog b/debian/changelog
index 93659bb..2271cdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ffmpeg-debian (4:0.5+svn20090609-2) unstable; urgency=low
+ffmpeg (4:0.5+svn20090609-2) unstable; urgency=low
 
   [ Fabian Greffrath ]
   * Remove .install files for unstripped packages that we do not build
diff --git a/debian/control b/debian/control
index 5c7dec8..296afcd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: ffmpeg-debian
+Source: ffmpeg
 Section: libs
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index afbb30b..6001b71 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -66,7 +66,7 @@ if [ -z $SVNDATE ]; then
 	error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
 fi
 
-TARBALL=../ffmpeg-debian_0.5+svn${SVNDATE}.orig.tar.gz
+TARBALL=../ffmpeg_0.5+svn${SVNDATE}.orig.tar.gz
 PACKAGENAME=ffmpeg
 
 TMPDIR=`mktemp -d`
diff --git a/debian/rules b/debian/rules
index 7dec70f..f79e589 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,8 +79,6 @@ clean-real:
 
 get-orig-source:
 	dh_testdir
-	# strip patented code
-	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -d $(SVN_VERSION)
 
 # The trailing newline is important!

-- 
FFmpeg packaging