[SCM] libav/master: Cleanup obsolete entries in README.Debian and libavcodec-dev.NEWS

Sat Jun 28 15:04:40 UTC 2014

The following commit has been merged in the master branch:
commit 60070b85ec3b75410605877ba0d6947ff0a22160
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 28 09:34:35 2014 -0400

    Cleanup obsolete entries in README.Debian and libavcodec-dev.NEWS
    
    These pieces of information are rather confusing these days, and serve
    no real value.

diff --git a/debian/README.Debian b/debian/README.Debian
index 3d1180d..0d27ec8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,69 +12,7 @@ i386 architecture, as we know that the upstream build system will
 produce PIC libraries where necessary. Only architectures like i386 will
 be built non-PIC, mainly for performance reasons.
 
- -- Reinhard Tartler <siretart at tauware.de>, Sun,  1 Aug 2010 14:39:10 -0400
-
-FFmpeg package names
-====================
-
-The ffmpeg packaging has seen many renames in the course of its history.
-Looking for more stable names, the ffmpeg maintainers agreed on moving to
-a naming scheme which would fit known use cases and avoid confusion.
-
-Some of the constraints and proposed solutions on the new names follow:
-
- 1. Distributions such as Debian and Ubuntu want to carry multiple version of
-    the package to fit component divisions and please users; e.g. an
-    Ubuntu/universe and an Ubuntu/multiverse version, or a Debian/main and a
-    Debian/non-free version.  It is conceived that there are usually two
-    variants of the ffmpeg package in these distributions: a) the vanilla
-    version shipped in the most permissible component if possible and b) a
-    'stripped' package suitable for the most constrained component.
-
-    For details why such a stripping is necessary in the first place, please
-    look further below in this document ("Disabled MPEG encoders").
-
- 2. Packages from distributions and third party repositories such as the popular
-    debian-multimedia.org shouldn't interfere but coexist nicely.  If these
-    repositories want to provide an alternate version of the source package,
-    they could do so with their own source and binary package names.  It is
-    hoped that providing the vanilla source in one of the source packages will
-    remove the need to fork ffmpeg in these third party repositories.
-
- 3. The libraries built by various source packages shall be ABI compatible as
-    to allow packages built against the most constrained component to run
-    against the more permissible components; for instance vlc if built against
-    ffmpeg in main shall be able to run against the ffmpeg libraries from
-    non-free.  The plan here is to use shlibs tricks to allow to install one
-    lib or the other.  The shlibs would look like:
-      lib-name-in-main-99 (>= 1.2.3) | lib-name-in-non-free-99 (>= 1.2.3)
-    This scheme can be extended for third party repositories if it still needs
-    to be.
-
-For consistency at this date, Debian is missing a ffmpeg-extra source
-package and Ubuntu had two source packages in the same component for a
-short time.  The binary package names are not unified and shlibs do not
-allow to install one or the other library.
-
-To avoid gratuitous package renames, the proposed changes against the above
-packages are:
-
-  * For Debian and Ubuntu the binary packages in the 'main' component will
-    keep their original names without any additional marker.
-
-  * The extra (unstripped) replacement packages in the 'non-free'
-    (Debian) and 'multiverse' (ubuntu) component will be built from a
-    source package named 'ffmpeg-extra'. The resulting binary packages
-    carry an '-extra-' marker in the name right between the library name
-    and its SONAME.
-
-  * Ubuntu will track the ffmpeg packages in Debian and tries to minimize the
-    diff for maintenance reason.
-
-  * If you disagree with the naming, please speak up on
-    pkg-multimedia-maintainers at lists.alioth.debian.org
-
- -- Reinhard Tartler <siretart at tauware.de>, Sun, 26 Jul 2009 10:38:10 +0200
+ -- Reinhard Tartler <siretart at tauware.de>, Sat, 28 Jun 2014 09:33:54 -0400
 
 Source package
 ==============
@@ -96,22 +34,3 @@ comment out the appropriate line in debian/confflags.
 Because libavcodec-extra-* links against libraries that are licensed
 under Apache License 2.0, the resulting binaries are distributed under
 the GPL version 3 or later.
-
-
-Differences with unofficial ffmpeg packages
-===========================================
-
-   There are popular unofficial ffmpeg packages at the following URL:
-
-     http://www.debian-multimedia.org/
-
-   I have nothing to do with these packages and it would be very tedious
-for me to track their changes. Given that my official packages use a
-Debian-specific naming scheme for libraries, you should be able to
-install at least the shared library packages together.
-
-   Before submitting a bug report, please make sure it is related to the
-Debian packages and not those unofficial packages.
-
-
- -- Sam Hocevar <sam at zoy.org>  Thu, 30 Mar 2006 10:23:16 +0200
diff --git a/debian/libavcodec-dev.NEWS b/debian/libavcodec-dev.NEWS
deleted file mode 100644
index 5250b95..0000000
--- a/debian/libavcodec-dev.NEWS
+++ /dev/null
@@ -1,9 +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 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

-- 
Libav/FFmpeg packaging

