[SCM] mplayer/master: Update documentation with regard to our modifications to the upstream tarball.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b8f6a0ae174f1bc2157fbedb6848d4a9e11d5259
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Feb 8 13:38:26 2011 +0100

    Update documentation with regard to our modifications to the upstream tarball.

diff --git a/debian/README.Debian b/debian/README.Debian
index b888afa..68d6cf2 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -28,10 +28,7 @@ This issue is pointed out in detail in the following thread:
   http://lists.debian.org/debian-legal/2003/debian-legal-200301/msg00231.html
 
 Currently mplayer ships files such as
-  liba52/liba52_changes.diff
   libfaad2/local_changes.diff
-  libmpdvdkit2/libdvdcss_changes.diff
-  libmpdvdkit2/libdvdread_changes.diff
   libmpeg2/libmpeg-0.4.0.diff
   tremor/tremor.diff
 to comply with this request.
diff --git a/debian/README.source b/debian/README.source
index 2c8880a..d9b7ea1 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,21 +1,12 @@
-This package uses quilt to manage all modifications to the upstream source.
-If you want to know more about how to use quilt to manage Debian patches, read
-/usr/share/doc/quilt/README.source.
-
-Only if you are building from the packaging gut branch, then the package
-expects you to have the quilt package installed.  For this reason, quilt
-is not an explicit build dependency.
-
-NB: The sources of this mplayer package have some parts removed!
+The sources of this mplayer package have some parts removed!
 
 * In order to update the package yourself and/or to review the changes done
   to the source code, please see the files:
 
    debian/README.upstream-upgrade
    debian/get-orig-source.sh
-   debian/strip.sh
 
-* In particular, the internal mpdvdkit library was deleted, so the mplayer
+* In particular, the internal libdvdcss library was deleted, so the mplayer
   package provided by Debian is unable to play encrypted DVDs. If you want to
   play encrypted DVDs (i.e. almost all available Video-DVDs), please follow
   the instructions in /usr/share/doc/libdvdread3/README.Debian on how to
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index bb30f72..8b7a271 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -64,7 +64,6 @@ if [ -z $SVNDATE ]; then
 	error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
 fi
 
-CLEANUPSCRIPT=`pwd`/debian/strip.sh
 TARBALL=`pwd`/../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
 TARBALL_UNSTRIPPED=`pwd`/../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
 PACKAGENAME=mplayer
@@ -113,7 +112,7 @@ echo $revision > ${dest}/.svnrevision
 
 tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
 	
-( cd ${TMPDIR}/${PACKAGENAME}-${SVNDATE} && sh ${CLEANUPSCRIPT} )
+( cd ${TMPDIR}/${PACKAGENAME}-${SVNDATE} && rm -rfv libdvdcss )
 
 tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
 
diff --git a/debian/strip.sh b/debian/strip.sh
deleted file mode 100644
index d0af3cb..0000000
--- a/debian/strip.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# This contains the dreaded DVD decryption code. We can live without it
-#  by using libdvdread3 (and the optional library installed by
-#    http://www.debian-unofficial.org/   :-)
-rm -rfv libdvdcss
-
-# play the most safe game at this point, remove mencoder.c from the
-# orig.tar.gz (again)
-rm -rfv mencoder.c
-
-# strip/clean the code from potentially dangerous patented code
-# KEEP THIS IN SYNC WITH THE ffmpeg-debian PACKAGE!
-for codec in 'h263.*' 'h264.*' mpeg2video mpeg4 'msmpeg4.*'; do
-    F=libavcodec/allcodecs.c
-    sed -i "/REGISTER_ENCODER.*\\<$codec\\>/d" $F
-    sed -i "s/REGISTER_ENCDEC\\(.*\\<$codec\\>\\)/REGISTER_DECODER\\1/" $F
-    F=libavcodec/*.c
-    sed -i "/AVCodec *${codec}_encoder *=/,/^[[:space:]]*}/d" $F
-done

-- 
mplayer packaging