[SCM] lame packaging branch, ubuntu, updated. debian/3.98.4-0ubuntu1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Jul 30 16:06:28 UTC 2010
The following commit has been merged in the ubuntu branch:
commit f653bcad3dacd1523f7c143587e161c507f66ad7
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Jul 30 09:44:26 2010 -0400
refreshed patches
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index 25e486e..788e1a0 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -1,28 +1,28 @@
Rebuilt upstream tarball without debian/ directory.
---- lame.orig/Makefile.am
-+++ lame/Makefile.am
-@@ -4,7 +4,7 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.am.global
.PHONY: test
-SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
- mac macosx
+ mac macosx vc_solution
CLEANFILES = testcase.new.mp3
---- lame.orig/configure
-+++ lame/configure
-@@ -30627,7 +30627,7 @@
+--- a/configure
++++ b/configure
+@@ -30627,7 +30627,7 @@ FRONTEND_LDADD="${FRONTEND_LDADD} ${CONF
--ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile"
-+ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile"
+-ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile"
++ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile"
cat >confcache <<\_ACEOF
-@@ -31277,7 +31277,6 @@
+@@ -31277,7 +31277,6 @@ do
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"Dll/Makefile") CONFIG_FILES="$CONFIG_FILES Dll/Makefile" ;;
"misc/Makefile") CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
@@ -30,24 +30,24 @@ Rebuilt upstream tarball without debian/ directory.
"dshow/Makefile") CONFIG_FILES="$CONFIG_FILES dshow/Makefile" ;;
"ACM/Makefile") CONFIG_FILES="$CONFIG_FILES ACM/Makefile" ;;
"ACM/ADbg/Makefile") CONFIG_FILES="$CONFIG_FILES ACM/ADbg/Makefile" ;;
---- lame.orig/configure.in
-+++ lame/configure.in
-@@ -1172,6 +1172,6 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1172,6 +1172,6 @@ AC_SUBST(CPUCCODE)
AC_SUBST(CONFIG_DEFS)
--AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile])
-+AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile])
+-AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile] vc_solution/Makefile)
++AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile] vc_solution/Makefile)
AC_OUTPUT
---- lame.orig/Makefile.in
-+++ lame/Makefile.in
-@@ -209,7 +209,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -209,7 +209,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.9 foreign $(top_srcdir)/ansi2knr
-SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
- mac macosx
+ mac macosx vc_solution
CLEANFILES = testcase.new.mp3
diff --git a/debian/patches/series b/debian/patches/series
index 38679d3..2c72597 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
01-debian-directory.patch
02-dynamic-frontends.patch
04-exec-stac.patch
-05-armel-no-finite-math-only.patch
\ No newline at end of file
+05-armel-no-finite-math-only.patch
--
lame packaging
More information about the pkg-multimedia-commits
mailing list