[SCM] lame/master: Refresh patches.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Thu Feb 23 23:47:02 UTC 2012
The following commit has been merged in the master branch:
commit d9628b8a8531a43ca8d964f60db15a9f64da7b98
Author: Andres Mejia <amejia004 at gmail.com>
Date: Sun Jan 29 10:40:02 2012 -0500
Refresh patches.
diff --git a/debian/patches/07-field-width-fix.patch b/debian/patches/07-field-width-fix.patch
index 2801e5f..8812966 100644
--- a/debian/patches/07-field-width-fix.patch
+++ b/debian/patches/07-field-width-fix.patch
@@ -6,7 +6,7 @@ Applied-Upstream: commit:1.282
--- a/frontend/parse.c
+++ b/frontend/parse.c
-@@ -369,11 +369,11 @@
+@@ -372,11 +372,11 @@
const char *b = get_lame_os_bitness();
const char *v = get_lame_version();
const char *u = get_lame_url();
diff --git a/debian/patches/parallel-builds-fix.patch b/debian/patches/parallel-builds-fix.patch
index 6a43e31..3270b85 100644
--- a/debian/patches/parallel-builds-fix.patch
+++ b/debian/patches/parallel-builds-fix.patch
@@ -36,7 +36,7 @@ Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches
@HAVE_NASM_TRUE at am_liblameasmroutines_la_OBJECTS = \
@HAVE_NASM_TRUE@ choose_table$U.lo \
@HAVE_NASM_TRUE@ cpu_feat$U.lo \
-@@ -521,11 +522,10 @@
+@@ -526,11 +527,10 @@
$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
.nas.lo: $< nasm.h
--
lame packaging
More information about the pkg-multimedia-commits
mailing list