[SCM] vlc/wheezy-backports: Add old-automake.patch to support building with automake 1.11 in wheezy

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Jan 16 12:37:20 UTC 2014


The following commit has been merged in the wheezy-backports branch:
commit 6d779ccde29da6c8a9a3d42193d1f203fc09d7f4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 16 07:37:04 2014 -0500

    Add old-automake.patch to support building with automake 1.11 in wheezy

diff --git a/debian/changelog b/debian/changelog
index 8560c77..d27f230 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ vlc (2.1.2-2~bpo70+1) wheezy-backports; urgency=low
   * Rebuild for wheezy-backports.
   * Tighten build dependencies on gettext, libsmbclient (for pkg-config
     file) and libav9
+  * Add old-automake.patch to support building with automake 1.11 in wheezy
 
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 11 Jan 2014 14:24:37 +0000
+ -- Reinhard Tartler <siretart at tauware.de>  Thu, 16 Jan 2014 07:36:36 -0500
 
 vlc (2.1.2-2) unstable; urgency=medium
 
diff --git a/debian/patches/old-automake.patch b/debian/patches/old-automake.patch
new file mode 100644
index 0000000..ffc4c12
--- /dev/null
+++ b/debian/patches/old-automake.patch
@@ -0,0 +1,15 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: Allow building with automake 1.11
+
+AM_SILENT_RULES were introduced in 1.13, which is not available in wheezy.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,6 +28,7 @@ AM_INIT_AUTOMAKE(tar-ustar color-tests f
+ AC_CONFIG_HEADERS([config.h])
+ 
+ # Disable with "./configure --disable-silent-rules" or "make V=1"
++m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+ 
+ dnl Too many people are not aware of maintainer mode:
diff --git a/debian/patches/series b/debian/patches/series
index 420def5..c4fec28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pnap-grammar.patch
+old-automake.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list