[SCM] ffms2/master: Bump debhelper compat to 9 and mark libffms2-3 M-A:same

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Dec 2 21:43:03 UTC 2013


The following commit has been merged in the master branch:
commit f730dd4b7d6b476b02addcb6498afc3114511540
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 2 20:51:49 2013 +0100

    Bump debhelper compat to 9 and mark libffms2-3 M-A:same

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 81f42a1..89a53ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
  Rico Tzschichholz <ricotz at ubuntu.com>
-Build-Depends: debhelper (>= 8.1),
+Build-Depends: debhelper (>= 9),
  dh-autoreconf,
  pkg-config,
  libavutil-dev (>= 4:0.7~),
@@ -20,6 +20,7 @@ Homepage: https://github.com/FFMS/ffms2
 
 Package: libffms2-3
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Cross platform ffmpeg wrapper library
  A cross platform ffmpeg wrapper library, and some additional content for
diff --git a/debian/rules b/debian/rules
index 72a71d0..09ee2e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-LDFLAGS=-Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 %:
-	dh --with autoreconf $@
+	dh $@ --with autoreconf
 
 override_dh_auto_build:
 	dh_auto_build -- V=1

-- 
ffms2 packaging



More information about the pkg-multimedia-commits mailing list