[SCM] libav/master: Disable libavserver (Closes: #734335)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e2fe43a546e93416f2f679225900eb4829e94b28
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 27 22:09:55 2014 -0400

    Disable libavserver (Closes: #734335)
    
    It turns out that avserver is pretty much unmaintained these days and
    contains obvious bugs. The next Libav upstream release has it already
    released, and further maintenance is currently rather unlikely. With
    this in mind, the libav package proactively disables the avserver build
    anticipating its removal upstream.
    
    If you are interested in having avserver back and functional, please
    help upstream with reinstantiating it.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..925bab1
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,15 @@
+libav (6:10.2-1) unstable; urgency=high
+
+   * Disable avserver (Closes: #734335)
+
+   It turns out that avserver is pretty much unmaintained these days and
+   contains obvious bugs. The next Libav upstream release has it already
+   released, and further maintenance is currently rather unlikely. With
+   this in mind, the libav package proactively disables the avserver build
+   anticipating its removal upstream.
+
+   If you are interested in having avserver back and functional, please
+   help upstream with reinstantiating it.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 27 Jun 2014 22:11:18 -0400
+
diff --git a/debian/confflags b/debian/confflags
index 3adedd0..0adb138 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -102,6 +102,7 @@ confflags += --extra-version='$(DEB_VERSION)'
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --prefix=/usr
 confflags += $(shell test -x /usr/bin/yasm || echo --disable-yasm )
+confflags += --disable-avserver
 
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
diff --git a/debian/control b/debian/control
index 52847f3..e0237a3 100644
--- a/debian/control
+++ b/debian/control
@@ -72,16 +72,16 @@ Suggests:
  frei0r-plugins (>= 1.3)
 Conflicts:
  ffprobe
-Description: Multimedia player, server, encoder and transcoder
+Description: Multimedia player, encoder and transcoder
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
  .
- This package contains the avplay multimedia player, the avserver
- streaming server, the avconv audio and video encoder, and the avprobe
- stream analyzer.  They support most existing file formats (AVI, MPEG,
- OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
- DV...). Additionally, it contains the qt-faststart utility which
- rearranges Quicktime files to facilitate network streaming.
+ This package contains the avplay multimedia player, the avconv audio
+ and video encoder, and the avprobe stream analyzer.  They support most
+ existing file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding
+ formats (MPEG, DivX, MPEG4, AC3, DV...). Additionally, it contains the
+ qt-faststart utility which rearranges Quicktime files to facilitate
+ network streaming.
  .
  This package replaces the 'ffmpeg' command-line tool that was provided
  in earlier distroreleases.
diff --git a/debian/libav-tools.maintscript b/debian/libav-tools.maintscript
deleted file mode 100644
index 2b013b7..0000000
--- a/debian/libav-tools.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-mv_conffile /etc/ffserver.conf /etc/avserver.conf 6:0.8.1-7 -- "$@" 0

-- 
Libav/FFmpeg packaging