[SCM] libav/experimental: Refactor conffile moving

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 54b5ba9872de15713bcf0f24fd690fdc83fccbac
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 12 11:07:11 2014 -0500

    Refactor conffile moving
    
    as suggested in
    https://lists.debian.org/debian-devel/2013/10/msg00392.html,
    dh_installdeb provides an easy interface for the dpkg-maintscript-helper
    utilities.

diff --git a/debian/control b/debian/control
index 3c6bafc..c001cdb 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,7 @@ Architecture: any
 Replaces:
  libavcodec-extra-53 (<< 4:0.6~)
 Pre-Depends:
+ ${misc:Pre-Depends},
  dpkg (>= 1.15.7.2~)
 Depends:
  ${misc:Depends},
diff --git a/debian/libav-tools.maintscript b/debian/libav-tools.maintscript
new file mode 100644
index 0000000..31abffc
--- /dev/null
+++ b/debian/libav-tools.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/ffserver.conf /etc/avserver.conf 6:0.8.1-7 -- "$@"
diff --git a/debian/libav-tools.postinst b/debian/libav-tools.postinst
deleted file mode 100644
index 3764300..0000000
--- a/debian/libav-tools.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile /etc/ffserver.conf /etc/avserver.conf 6:0.8.1-7 -- "$@"
-fi
-
-#DEBHELPER#
diff --git a/debian/libav-tools.postrm b/debian/libav-tools.postrm
deleted file mode 100644
index 3764300..0000000
--- a/debian/libav-tools.postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile /etc/ffserver.conf /etc/avserver.conf 6:0.8.1-7 -- "$@"
-fi
-
-#DEBHELPER#
diff --git a/debian/libav-tools.preinst b/debian/libav-tools.preinst
deleted file mode 100644
index 3764300..0000000
--- a/debian/libav-tools.preinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile /etc/ffserver.conf /etc/avserver.conf 6:0.8.1-7 -- "$@"
-fi
-
-#DEBHELPER#

-- 
Libav/FFmpeg packaging