[SCM] ffmpeg/master: clean up NEWS.Debian and related documentation

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b48d16cffe71fc3e2ff8197b517b2635464e9e3f
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Mon May 2 19:20:32 2011 -0500

    clean up NEWS.Debian and related documentation
    
    libav provides a NEWS.Debian file under debian/ but does not install
    it currently; rename it to libavcodec-dev.NEWS so apt-listchanges can
    automatically install it.  Only installing in a -dev package ensures
    sysadmins without the development libraries installed don't have to
    worry about API changes that will be irrelevant to them.  Just the
    libavcodec-dev package should be enough to make the API changes
    visible.
    
    While at it, move APIchanges.gz so it is just installed by the various
    development libraries and libav-doc.  The details of the API would be
    irrelevant to someone just using programs that use the library.  Maybe
    APIchanges should just be in libav-doc, but to be conservative this
    keeps it in the development libraries too for now.
    
    Now that NEWS is attached to a particular package and shown on
    upgrade, it does not seem like a good place to mention the source
    package renaming, which does not require any action in response to the
    upgrade.  Move the note to README.Debian, where it is more likely to
    help the confused reader.
    
    Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index f1f3a92..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,18 +0,0 @@
-libav (4:0.7~b1-1) experimental; urgency=low
-
-  * The 0.7 release series of Libav has a number of old and deprecated
-    APIs removed, so your packages might need some adaptations. Please see
-    the file /usr/share/doc/libavcodec53/APIChanges for a list of API
-    additions and removals. More detailed information about the new API is
-    provided in the shipped doxygen documentation.
-
- -- Reinhard Tartler <siretart at tauware.de>  Tue, 19 Apr 2011 15:04:55 +0200
-
-libav (4:0.6.2-1) unstable; urgency=low
-
-  * Libav represents the successor of the former ffmpeg source package. It
-    provides all libraries and provides an upgrade path for existing
-    application packages.  
-
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 19 Mar 2011 08:13:46 +0100
-
diff --git a/debian/README.Debian b/debian/README.Debian
index 405e591..798b209 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -76,6 +76,15 @@ packages are:
 
  -- Reinhard Tartler <siretart at tauware.de>, Sun, 26 Jul 2009 10:38:10 +0200
 
+Source package
+==============
+
+Libav represents the successor of the former ffmpeg source package. It
+provides all libraries and provides an upgrade path for existing
+application packages.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 19 Mar 2011 08:13:46 +0100
+
 License of the Debian ffmpeg packages
 =====================================
 
diff --git a/debian/changelog b/debian/changelog
index 79648f8..a66178a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 libav (4:0.7~b1-3) UNRELEASED; urgency=low
 
   * start new upload
+  * only install doc/APIChanges in *-dev and libav-doc packages
+  * move note on source package lineage to README.Debian
+  * install NEWS.Debian in libavcodec-dev
 
- -- Reinhard Tartler <siretart at tauware.de>  Tue, 03 May 2011 13:12:58 +0200
+ -- Jonathan Nieder <jrnieder at gmail.com>  Mon, 02 May 2011 19:10:14 -0500
 
 libav (4:0.7~b1-2) experimental; urgency=low
 
diff --git a/debian/libavcodec-dev.NEWS b/debian/libavcodec-dev.NEWS
new file mode 100644
index 0000000..5250b95
--- /dev/null
+++ b/debian/libavcodec-dev.NEWS
@@ -0,0 +1,9 @@
+libav (4:0.7~b1-1) experimental; urgency=low
+
+  The 0.7 release series of Libav has a number of old and deprecated
+  APIs removed, so your packages might need some adaptations. Please see
+  the file APIChanges.gz for a list of API additions and removals. More
+  detailed information about the new API is provided in the shipped
+  doxygen documentation.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 19 Apr 2011 15:04:55 +0200
diff --git a/debian/rules b/debian/rules
index 1f30d79..67db8aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,10 +116,14 @@ binary-arch: build install codecs.txt formats.txt
 	dh_testroot
 	dh_installman -pffmpeg debian/qt-faststart.1
 	dh_installdocs doc/optimization.txt
-	dh_installdocs -A CREDITS doc/TODO doc/APIchanges
+	dh_installdocs -A CREDITS doc/TODO
 	dh_installdocs -A debian/README.Debian
 	dh_installdocs -p libavcodec52 codecs.txt
 	dh_installdocs -p libavformat52 formats.txt
+	dh_installdocs -p libavcodec-dev -plibavdevice-dev \
+		-plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
+		-plibswscale-dev -plibavutil-dev -plibav-doc \
+		doc/APIchanges
 	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
 	dh_installexamples -plibavcodec-dev libavcodec/api-example.c
 	dh_installchangelogs Changelog

-- 
Libav/FFmpeg packaging