diff -Nru lame-3.99.5+repack1/debian/changelog lame-3.99.5+repack1/debian/changelog --- lame-3.99.5+repack1/debian/changelog 2013-12-23 02:44:09.000000000 +0000 +++ lame-3.99.5+repack1/debian/changelog 2015-01-20 17:04:45.000000000 +0000 @@ -1,9 +1,39 @@ -lame (3.99.5+repack1-3ubuntu1) trusty; urgency=medium +lame (3.99.5+repack1-5~ppa14.10+1) utopic; urgency=medium - * Use dh-autoreconf for better new port coverage. - * Patch out remaining ansi2knr. + * Merge from Debian Unstable. - -- Dimitri John Ledkov Mon, 23 Dec 2013 02:38:01 +0000 + -- Nicolas Derive Tue, 20 Jan 2015 18:02:25 +0100 + +lame (3.99.5+repack1-5) unstable; urgency=medium + + * Team upload. + * debian/patches/msse.patch: Build xmm_quantize_sub.c with -msse to fix a + build failure on any-i386. This also enables SSE support on i386 if SSE + support is detected at runtime. (Closes: #760047) + + -- Sebastian Ramacher Sun, 31 Aug 2014 16:05:00 +0200 + +lame (3.99.5+repack1-4) unstable; urgency=medium + + * Team upload. + + [ Alessio Treglia ] + * Build with dh-autoreconf. (Closes: #755111) + + [ Sebastian Ramacher ] + * debian/control: + - Remove Andres Mejia from Uploaders since he is MIA. Thank you for + maintaining lame, Andres! (Closes: #743522) + - Remove obsolete DM-Upload-Allowed. + - Change Maintainer to match other packages maintained by the team. + - Add missing B-D dh-autoreconf and pkg-config. + - Bump Standards-Version to 3.9.5 + - Remove obsolete Breaks / Replaces. + - Use canonical Vcs-* locations. + * debian/patches/privacy-breach.patch: Fix privacy-breach linitan erros in + HTML documentation. + + -- Sebastian Ramacher Sat, 30 Aug 2014 21:34:51 +0200 lame (3.99.5+repack1-3) unstable; urgency=low diff -Nru lame-3.99.5+repack1/debian/control lame-3.99.5+repack1/debian/control --- lame-3.99.5+repack1/debian/control 2013-12-23 02:49:37.000000000 +0000 +++ lame-3.99.5+repack1/debian/control 2014-08-30 19:34:33.000000000 +0000 @@ -1,23 +1,20 @@ Source: lame Section: sound Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian multimedia packages maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: Fabian Greffrath , - Reinhard Tartler , - Andres Mejia + Reinhard Tartler Build-Depends: - debhelper (>= 8.1.3), + debhelper (>= 9), dh-autoreconf, - pkg-config, libncurses5-dev, + pkg-config, nasm [i386] -Standards-Version: 3.9.3 -DM-Upload-Allowed: yes +Standards-Version: 3.9.5 Homepage: http://lame.sourceforge.net/ -Vcs-Git: git://git.debian.org/git/pkg-multimedia/lame.git -Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/lame.git +Vcs-Git: git://anonscm.debian.org/pkg-multimedia/lame.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git Package: lame Architecture: any @@ -53,10 +50,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: - liblame0 -Replaces: - liblame0 Description: MP3 encoding library LAME (LAME Ain't an MP3 Encoder) is a research project for learning about and improving MP3 encoding technology. LAME includes an MP3 encoding library, a diff -Nru lame-3.99.5+repack1/debian/patches/ansi2knr2devnull.patch lame-3.99.5+repack1/debian/patches/ansi2knr2devnull.patch --- lame-3.99.5+repack1/debian/patches/ansi2knr2devnull.patch 2013-12-23 02:45:54.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/ansi2knr2devnull.patch 2014-08-30 19:10:10.000000000 +0000 @@ -1,6 +1,6 @@ Description: Patch out remaining ansi2knr. Author: Dimitri John Ledkov - +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111 --- a/configure.in +++ b/configure.in @@ -78,7 +78,6 @@ diff -Nru lame-3.99.5+repack1/debian/patches/debian-as-extra-dist.patch lame-3.99.5+repack1/debian/patches/debian-as-extra-dist.patch --- lame-3.99.5+repack1/debian/patches/debian-as-extra-dist.patch 2012-03-15 21:42:57.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/debian-as-extra-dist.patch 2014-07-03 05:34:51.000000000 +0000 @@ -1,6 +1,8 @@ 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 +Forwarded: yes +Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/Makefile.am?revision=1.39 --- a/Makefile.am +++ b/Makefile.am diff -Nru lame-3.99.5+repack1/debian/patches/gtk1-ac-directives.patch lame-3.99.5+repack1/debian/patches/gtk1-ac-directives.patch --- lame-3.99.5+repack1/debian/patches/gtk1-ac-directives.patch 2012-03-15 21:37:52.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/gtk1-ac-directives.patch 2014-07-03 05:34:51.000000000 +0000 @@ -1,5 +1,7 @@ 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 +Forwarded: yes +Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?revision=1.6 --- a/acinclude.m4 +++ b/acinclude.m4 diff -Nru lame-3.99.5+repack1/debian/patches/msse.patch lame-3.99.5+repack1/debian/patches/msse.patch --- lame-3.99.5+repack1/debian/patches/msse.patch 1970-01-01 00:00:00.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/msse.patch 2014-08-31 13:57:52.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Build xmm_quantize_sub.c with -msse +Author: Sebastian Ramacher +Bug: http://sourceforge.net/p/lame/bugs/443/ +Bug-Debian: https://bugs.debian.org/760047 +Forwarded: http://sourceforge.net/p/lame/bugs/443/ +Last-Update: 2014-08-31 + +--- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am ++++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am +@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c + + if WITH_XMM + liblamevectorroutines_la_SOURCES = $(xmm_sources) ++liblamevectorroutines_la_CFLAGS = -msse + endif + + noinst_HEADERS = lame_intrin.h diff -Nru lame-3.99.5+repack1/debian/patches/parallel-builds-fix.patch lame-3.99.5+repack1/debian/patches/parallel-builds-fix.patch --- lame-3.99.5+repack1/debian/patches/parallel-builds-fix.patch 2012-03-15 21:37:52.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/parallel-builds-fix.patch 2014-07-03 05:34:51.000000000 +0000 @@ -1,5 +1,7 @@ Description: Fix race condition causing build failures on i386. Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches/parallel-builds-fix.patch +Forwarded: yes +Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/libmp3lame/i386/Makefile.am?revision=1.27 --- a/libmp3lame/i386/Makefile.am +++ b/libmp3lame/i386/Makefile.am diff -Nru lame-3.99.5+repack1/debian/patches/privacy-breach.patch lame-3.99.5+repack1/debian/patches/privacy-breach.patch --- lame-3.99.5+repack1/debian/patches/privacy-breach.patch 1970-01-01 00:00:00.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/privacy-breach.patch 2014-08-30 19:30:30.000000000 +0000 @@ -0,0 +1,267 @@ +Description: Fix privacy-breach lintian error +Author: Sebastian Ramacher +Last-Update: 2014-08-30 + +--- lame-3.99.5+repack1.orig/doc/html/about.html ++++ lame-3.99.5+repack1/doc/html/about.html +@@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a + + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/cbr.html ++++ lame-3.99.5+repack1/doc/html/cbr.html +@@ -82,9 +82,9 @@ without scanning and partially decoding + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/contact.html ++++ lame-3.99.5+repack1/doc/html/contact.html +@@ -104,9 +104,9 @@ + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/contributors.html ++++ lame-3.99.5+repack1/doc/html/contributors.html +@@ -169,9 +169,9 @@ + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/detailed.html ++++ lame-3.99.5+repack1/doc/html/detailed.html +@@ -1259,9 +1259,9 @@ so using it shouldn't cause harm. + + + + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/list.html ++++ lame-3.99.5+repack1/doc/html/list.html +@@ -47,9 +47,9 @@ + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/ms_stereo.html ++++ lame-3.99.5+repack1/doc/html/ms_stereo.html +@@ -104,9 +104,9 @@ href="http://en.wikipedia.org/wiki/Joint + + + + +- +\ No newline at end of file ++ +--- lame-3.99.5+repack1.orig/doc/html/usage.html ++++ lame-3.99.5+repack1/doc/html/usage.html +@@ -116,9 +116,9 @@ sounds transparent. Use lossless codecs + + + + + +- +\ No newline at end of file ++ diff -Nru lame-3.99.5+repack1/debian/patches/series lame-3.99.5+repack1/debian/patches/series --- lame-3.99.5+repack1/debian/patches/series 2013-12-23 02:44:23.000000000 +0000 +++ lame-3.99.5+repack1/debian/patches/series 2014-08-31 13:42:32.000000000 +0000 @@ -2,3 +2,5 @@ parallel-builds-fix.patch unbreak-ftbfs-gcc4.4.patch ansi2knr2devnull.patch +privacy-breach.patch +msse.patch