[SCM] mplayer packaging branch, master, updated. upstream/0.svn20090303-68-gdae3a89

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6bc60124352dc776eef62d08619ddb4c1b5c9616
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 5 00:10:10 2009 +0100

    update installed READMEs with up-to-date information
    
    the current package only supports svn snapshots and defines a new
    process for updating it. while it is based and tested in the debian
    ffmpeg package, it has significant differences to the previous
    approach. Therefore the installed documentation must match it.

diff --git a/debian/README.Debian.free b/debian/README.Debian.free
index 8f666c4..68294fb 100644
--- a/debian/README.Debian.free
+++ b/debian/README.Debian.free
@@ -4,17 +4,14 @@
 
 WARNING WARNING WARNING WARNING
 
-the  mplayer*.tar.gz in Debian is  different from  @UPSTREAMSOURCE@
+The sources as published in debian/main have some parts removed!
 
+* In order to update the package yourself and/or review the changes done
+  to the source code, please see the files:
 
-* If the code is pulled from SVN, then tar.gz in Debian is
-obtained by
-  debian/rules copy-orig-from-svn
-  debian/rules fix-orig-source
-If the code is from an upstream .tar.gz , then tar.gz in Debian is
-obtained by
-  debian/rules download-and-unpack-orig
-  debian/rules fix-orig-source
+   debian/README.upstream-upgrade
+   debian/get-orig-source.sh
+   debian/strip.sh
 
 * In particular, the mpdvdkit internal library was deleted: so
   mplayer.deb is uncapable to play encrypted DVDs ; if you want to
@@ -26,7 +23,7 @@ obtained by
  FOR FEATURES, but, send bugs to Debian: indeed, missing features
  and/or bugs may be due to my butchering of the upstream code
 
-A. Mennucc
+A. Mennucc with adaptions by Reinhard Tartler
 
 -------------- on GPLv2 sec 2.a
 
diff --git a/debian/README.Debian.nonfree b/debian/README.Debian.nonfree
index 6dad924..fe5ddf8 100644
--- a/debian/README.Debian.nonfree
+++ b/debian/README.Debian.nonfree
@@ -1,7 +1,8 @@
 #this part is conditionally added if the source was not DFSG free
 
 This version of the mplayer binary and sources contains all the code
-found in the original @UPSTREAMSOURCE@
+found as published by the mplayer developer team,
 
-For this reason, it is not fit for inclusion in the main Debian archive.
+Debian has concern with distributing various bits of it, so it currently
+cannot be included into the debian archive.
 
diff --git a/debian/rules b/debian/rules
index 3481110..e6fd9d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -282,11 +282,15 @@ binary-common:
 	if test -r	debian/$(THISPACKAGE)/DEBIAN/config ; then sh -e debian/config.augmenter debian/$(THISPACKAGE)/DEBIAN/config ; fi
 #	Rewrite README.Debian and add free or non-free statement.
 ifeq ($(DEB_SOURCE),mplayer)
-	tail -n +2  debian/README.Debian.free | sed 's!@UPSTREAMSOURCE@!$(UPSTREAMSOURCE)!' > debian/$(THISPACKAGE)/usr/share/doc/$(THISPACKAGE)/README.Debian
+	tail -n +2  debian/README.Debian.free \
+	  > debian/$(THISPACKAGE)/usr/share/doc/$(THISPACKAGE)/README.Debian
 else
-	tail -n +2  debian/README.Debian.nonfree | sed 's!@UPSTREAMSOURCE@!$(UPSTREAMSOURCE)!' > debian/$(THISPACKAGE)/usr/share/doc/$(THISPACKAGE)/README.Debian
+	tail -n +2  debian/README.Debian.nonfree \
+	  > debian/$(THISPACKAGE)/usr/share/doc/$(THISPACKAGE)/README.Debian
 endif
-	sed 's!@DEB_BUILD_CONFIGURE@!$(DEB_BUILD_CONFIGURE)!' < debian/README.Debian  >>	 debian/$(THISPACKAGE)/usr/share/doc/$(THISPACKAGE)/README.Debian
+	sed 's!@DEB_BUILD_CONFIGURE@!$(DEB_BUILD_CONFIGURE)!' \
+	  <  debian/README.Debian \
+	  >> debian/$(THISPACKAGE)/usr/share/doc/$(THISPACKAGE)/README.Debian
 
 ########
 	dh_compress

-- 
mplayer packaging