[SCM] mplayer packaging branch, master, updated. 23fdd8bc0ecf6a13222e4d3c8a1cd1826b39b01b

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b36d045466da08f2397df27e7d6d43f9eaa85463
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 14:31:30 2009 +0100

    rename the upstream debian directory in get-orig-source.sh
    
    this step doesn't belong in strip.sh, because the unstripped source
    should have this directory renamed as well.

diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index df16bc8..215a10e 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -97,6 +97,11 @@ while read external url; do
       > ${TMPDIR}/${PACKAGENAME}/${external}/.svnrevision
 done
 
+# this doesn't belong in strip.sh, because the unstripped source should
+# have this directory renamed as well.
+( cd ${TMPDIR}/${PACKAGENAME} && mv debian debian_upstream )
+
+
 tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}
 	
 ( cd ${TMPDIR}/${PACKAGENAME} && sh ${CLEANUPSCRIPT} )
diff --git a/debian/strip.sh b/debian/strip.sh
index b3742cd..80f0b86 100755
--- a/debian/strip.sh
+++ b/debian/strip.sh
@@ -15,9 +15,6 @@ rm -rf TOOLS
 #Check if upstream includes DOCS and then don't rebuild them.
 if [ -r DOCS/HTML ]; then touch DOCS/.upstream_ships_docs; fi
 
-# My debian dir is too different.
-mv debian debian_upstream
-
 # Do not support encoding in any way.
 rm -fv mencoder.c
 

-- 
mplayer packaging