[SCM] mplayer packaging branch, master, updated. upstream/0.svn20090303-80-g39b9bb3

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c9a12bba633de2f61613c2f3469bb1e6f827d84a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 7 16:09:50 2009 +0100

    delete rather than rename the upstream debian/ directory.
    
    Since we don't need it anyway, we can as wenn just remove it. Originally
    suggested by Fabian Greffrath.
    
    This is in consent with upstream, irclog from 07.03.2009:
    
    17:38:09 < siretart> 2nd question: would you mind if I removed the
                         debian/ directory from the mplayer tarballs in
                         debian? in debian we are using a totally different
                         packaging anyways...
    17:39:02 <@uau> siretart: the debian/ subdirectory is outdated anyway
    17:39:08 <@uau> it should be either updated or removed
    17:39:38 <@uau> why would anyone care whether it's in the tarball?
    17:40:20 <@uau> i mean i doubt many users use the debian source tarballs
                    as a way of getting original upstream sources
    17:40:53 < siretart> because of very boring technical details in debian
                         packaging
    17:41:05 < siretart> if we leave the upstream orig.tar.gz, the diff.gz
                         would be *very* ugly
    17:41:13 <@uau> yes i understand why you'd want to remove it
    17:41:18 <@uau> i mean why did you even bother asking
    17:41:36 < siretart> because andrea mennucc said DonDiego didn't want that
    17:41:44 < siretart> anyway, I'm out for shopping, brb in about an hour
    [...]
    17:50:48 <@DonDiego> siretart: you can remove it if you want of course
    17:51:15 <@DonDiego> siretart: ideally i think we should try to get both
                         dirs to be as similar as possible
    
    The latter is what we'll try in the master.upstream branch after the
    next upload to unstable.

diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index fc9a562..bb8f754 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -99,7 +99,7 @@ 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 )
+( cd ${TMPDIR}/${PACKAGENAME} && rm -rfv debian )
 
 ( cd ${TMPDIR}/ && mv ${PACKAGENAME} ${PACKAGENAME}-${SVNDATE} )
 

-- 
mplayer packaging