[SCM] lame/master: Update get-orig-source and patches for new upstream release.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Thu Feb 23 23:47:01 UTC 2012
The following commit has been merged in the master branch:
commit 40a29f433d14ef31d55286566bf715ca75006714
Author: Andres Mejia <amejia004 at gmail.com>
Date: Sun Jan 29 10:36:17 2012 -0500
Update get-orig-source and patches for new upstream release.
diff --git a/debian/lame-get-orig-source b/debian/lame-get-orig-source
index f5c512c..b7ca87d 100755
--- a/debian/lame-get-orig-source
+++ b/debian/lame-get-orig-source
@@ -4,10 +4,10 @@ set -e
# Script used to generate the orig source tarball for lame.
-LAME_UPSTREAM_VERSION="3.99.3"
+LAME_UPSTREAM_VERSION="3.99.4"
LAME_DOWNLOAD_URL="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_UPSTREAM_VERSION}.tar.gz"
LAME_VERSION="${LAME_UPSTREAM_VERSION}+repack1"
-LAME_TARBALL_CHECKSUM="d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf"
+LAME_TARBALL_CHECKSUM="41431a029e40b1d4f5c1697e942fb74c8ab09855c880ce0f439cd782b7058ec4"
# Download and verify lame upstream tarball
test -f "lame-${LAME_UPSTREAM_VERSION}.tar.gz" || wget -c "${LAME_DOWNLOAD_URL}"
diff --git a/debian/patches/debian-as-extra-dist.patch b/debian/patches/debian-as-extra-dist.patch
index 5487ef5..f6b1e66 100644
--- a/debian/patches/debian-as-extra-dist.patch
+++ b/debian/patches/debian-as-extra-dist.patch
@@ -2,11 +2,9 @@ Description: Include debian as extra directory instead of directory part of
subdirectories used in build.
Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
-diff --git a/Makefile.am b/Makefile.am
-index 3379849..ae646f9 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.am.global
+@@ -4,7 +4,7 @@
.PHONY: test
@@ -15,7 +13,7 @@ index 3379849..ae646f9 100644
mac macosx vc_solution
CLEANFILES = testcase.new.mp3
-@@ -22,6 +22,7 @@ EXTRA_DIST = \
+@@ -22,6 +22,7 @@
STYLEGUIDE \
USAGE \
configMS.h \
@@ -23,11 +21,9 @@ index 3379849..ae646f9 100644
lame.bat \
lame.spec.in \
lame.spec \
-diff --git a/configure.in b/configure.in
-index a83666a..d52c542 100644
--- a/configure.in
+++ b/configure.in
-@@ -1147,6 +1147,6 @@ AC_SUBST(CPUCCODE)
+@@ -1147,6 +1147,6 @@
AC_SUBST(CONFIG_DEFS)
diff --git a/debian/patches/gtk1-ac-directives.patch b/debian/patches/gtk1-ac-directives.patch
index 035b854..c3c363f 100644
--- a/debian/patches/gtk1-ac-directives.patch
+++ b/debian/patches/gtk1-ac-directives.patch
@@ -1,11 +1,9 @@
Description: Include GTK-1 autoconf directives in build system.
Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
-diff --git a/acinclude.m4 b/acinclude.m4
-index 0b8f869..eef0c3d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -85,4 +85,197 @@ int main(void)
+@@ -85,4 +85,197 @@
[AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)]
)])]) # alex_IEEE854_FLOAT80
--
lame packaging
More information about the pkg-multimedia-commits
mailing list