Bug#623682: [PATCH 1/3] clean up NEWS.Debian and related documentation

Jonathan Nieder jrnieder at gmail.com
Tue May 3 00:20:32 UTC 2011


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>
---
 debian/NEWS.Debian         |   18 ------------------
 debian/README.Debian       |    9 +++++++++
 debian/changelog           |    8 ++++++++
 debian/libavcodec-dev.NEWS |    9 +++++++++
 debian/rules               |    6 +++++-
 5 files changed, 31 insertions(+), 19 deletions(-)
 delete mode 100644 debian/NEWS.Debian
 create mode 100644 debian/libavcodec-dev.NEWS

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 9f6d545..dc47350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libav (4:0.7~b1-2.1) local; urgency=low
+
+  * 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
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Mon, 02 May 2011 19:10:14 -0500
+
 libav (4:0.7~b1-2) experimental; urgency=low
 
   * don't try to install non-existing documentation, fixes FTBFS on powerpc
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
-- 
1.7.5






More information about the pkg-multimedia-maintainers mailing list