[SCM] lame/master: Refresh patches. Remove patches applied upstream.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Thu Mar 15 21:58:37 UTC 2012


The following commit has been merged in the master branch:
commit 9fc52fe883675f8ee6246e69732a5cff834531ee
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Thu Mar 15 17:49:18 2012 -0400

    Refresh patches. Remove patches applied upstream.

diff --git a/debian/patches/alpha-build-fix.patch b/debian/patches/alpha-build-fix.patch
deleted file mode 100644
index a4fa834..0000000
--- a/debian/patches/alpha-build-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix for alpha builds. alpha needs include guards for config.h.
-Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
-
---- a/configure.in
-+++ b/configure.in
-@@ -28,6 +28,11 @@
- dnl automake
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([config.h])
-+AH_TOP([
-+#ifndef LAME_CONFIG_H
-+#define LAME_CONFIG_H
-+])
-+AH_BOTTOM([#endif /* LAME_CONFIG_H */])
- AM_MAINTAINER_MODE
- AM_MAKE_INCLUDE
- 
---- a/config.h.in
-+++ b/config.h.in
-@@ -1,5 +1,10 @@
- /* config.h.in.  Generated from configure.in by autoheader.  */
- 
-+
-+#ifndef LAME_CONFIG_H
-+#define LAME_CONFIG_H
-+
-+
- /* debug define */
- #undef ABORTFP
- 
-@@ -367,3 +372,5 @@
- 
- /* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
-+
-+#endif /* LAME_CONFIG_H */
---- a/configure
-+++ b/configure
-@@ -3101,6 +3101,8 @@
- ac_config_headers="$ac_config_headers config.h"
- 
- 
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-     # Check whether --enable-maintainer-mode was given.
diff --git a/debian/patches/series b/debian/patches/series
index 396427c..fb10f5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 07-field-width-fix.patch
 parallel-builds-fix.patch
-alpha-build-fix.patch
 unbreak-ftbfs-gcc4.4.patch

-- 
lame packaging



More information about the pkg-multimedia-commits mailing list