[SCM] faac/master: Disable mp4v2 support.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri Mar 23 14:15:34 UTC 2012


The following commit has been merged in the master branch:
commit 5dd8ffe4933a4a6ca67d95218a18a60baad32f51
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Fri Mar 23 10:15:12 2012 -0400

    Disable mp4v2 support.

diff --git a/debian/changelog b/debian/changelog
index b9ac56b..8dfc1c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+faac (1.28-5) UNRELEASED; urgency=low
+
+  * Disable mp4v2 support.
+    This only disables mp4v2 for the faac utility program. The faac
+    utility is GPL-2 but the mp4v2 library is MPL-1.1. The two licenses
+    are incompatible with each other.
+
+ -- Andres Mejia <amejia at debian.org>  Fri, 23 Mar 2012 10:12:22 -0400
+
 faac (1.28-4) unstable; urgency=low
 
   * Upload to Debian. (Closes: #665318)
diff --git a/debian/control b/debian/control
index f30fab9..028c3c3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: Fabian Greffrath <fabian+debian at greffrath.com>,
            Andres Mejia <amejia at debian.org>,
            Maia Kozheva <sikon at ubuntu.com>
 Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- libmp4v2-dev (>= 1.9.1)
+ dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://www.audiocoding.com/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/faac.git
diff --git a/debian/rules b/debian/rules
index dd9063b..81b3287 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,6 @@
 
 %:
 	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	dh_auto_configure -- --without-mp4v2

-- 
faac packaging



More information about the pkg-multimedia-commits mailing list