[Restricted-changes] r179 - in dists/trunk/lame/debian: . bug patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Mon Sep 8 14:51:21 UTC 2008
Author: fabian-guest
Date: 2008-09-08 14:51:20 +0000 (Mon, 08 Sep 2008)
New Revision: 179
Added:
dists/trunk/lame/debian/bug/lame-doc
dists/trunk/lame/debian/lame-dbg.lintian-overrides
dists/trunk/lame/debian/lame-doc.docs
dists/trunk/lame/debian/lame-doc.examples
dists/trunk/lame/debian/lame-doc.install
dists/trunk/lame/debian/lame-doc.lintian-overrides
dists/trunk/lame/debian/lame.lintian-overrides
dists/trunk/lame/debian/libmp3lame-dev.lintian-overrides
dists/trunk/lame/debian/libmp3lame0.lintian-overrides
dists/trunk/lame/debian/patches/01-debian-directory.patch
dists/trunk/lame/debian/patches/02-shared-frontend.patch
dists/trunk/lame/debian/patches/03-manpage-syntax.patch
dists/trunk/lame/debian/patches/series
Removed:
dists/trunk/lame/debian/bug/lame-utils
dists/trunk/lame/debian/lame-utils.install
dists/trunk/lame/debian/lame-utils.menu
dists/trunk/lame/debian/lame.docs
dists/trunk/lame/debian/lame.menu
dists/trunk/lame/debian/lintian/
dists/trunk/lame/debian/patches/01_debian-directory.patch
dists/trunk/lame/debian/patches/02_as-needed.patch
dists/trunk/lame/debian/patches/03_shared-frontend.patch
dists/trunk/lame/debian/patches/04_manpage-syntax.patch
dists/trunk/lame/debian/patches/05_gcc-4.3.patch
Modified:
dists/trunk/lame/debian/changelog
dists/trunk/lame/debian/compat
dists/trunk/lame/debian/control
dists/trunk/lame/debian/lame.install
dists/trunk/lame/debian/libmp3lame-dev.install
dists/trunk/lame/debian/rules
dists/trunk/lame/debian/watch
Log:
LAME 3.98
Added: dists/trunk/lame/debian/bug/lame-doc
===================================================================
--- dists/trunk/lame/debian/bug/lame-doc (rev 0)
+++ dists/trunk/lame/debian/bug/lame-doc 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Deleted: dists/trunk/lame/debian/bug/lame-utils
===================================================================
--- dists/trunk/lame/debian/bug/lame-utils 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/bug/lame-utils 2008-09-08 14:51:20 UTC (rev 179)
@@ -1 +0,0 @@
-Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Modified: dists/trunk/lame/debian/changelog
===================================================================
--- dists/trunk/lame/debian/changelog 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/changelog 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,3 +1,12 @@
+lame (3.98+debian-1) unstable; urgency=low
+
+ * New upstream release.
+ * Rebuilt upstream tarball without debian/ directory.
+ * Removed lame-utils package.
+ * Added lame-doc package.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 1 Sep 2008 00:00:00 +0100
+
lame (3.97+debian-2) unstable; urgency=low
* Converted Debian packaging to CDBS.
@@ -8,6 +17,6 @@
lame (3.97+debian-1) unstable; urgency=low
* Initial release.
- * Rebuilt upstream tarball without debian directory.
+ * Rebuilt upstream tarball without debian/ directory.
-- Daniel Baumann <daniel at debian.org> Sun, 7 Jan 2007 00:00:00 +0100
Modified: dists/trunk/lame/debian/compat
===================================================================
--- dists/trunk/lame/debian/compat 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/compat 2008-09-08 14:51:20 UTC (rev 179)
@@ -1 +1 @@
-5
+7
Modified: dists/trunk/lame/debian/control
===================================================================
--- dists/trunk/lame/debian/control 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/control 2008-09-08 14:51:20 UTC (rev 179)
@@ -2,16 +2,10 @@
Section: restricted/sound
Priority: optional
Maintainer: Debian Restricted <restricted-devel at lists.alioth.debian.org>
-Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>,
- Daniel Baumann <daniel at debian.org>
+Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
Origin: debian-unofficial.org
Bugs: mailto:restricted-devel at lists.alioth.debian.org
-Build-Depends: autotools-dev,
- cdbs (>= 0.4.41),
- debhelper (>= 5),
- libgtk1.2-dev,
- libncurses5-dev,
- nasm [i386]
+Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 7), libncurses5-dev, libsndfile1-dev, nasm [i386], quilt
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/lame/
Vcs-Browser: http://svn.debian.org/wsvn/restricted/dists/trunk/lame/
@@ -20,8 +14,7 @@
Package: lame
Section: restricted/sound
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: lame-utils
Description: MPEG Audio Layer III (MP3) encoder
This is an educational tool to be used for learning about MP3 encoding. The
@@ -45,11 +38,7 @@
Section: restricted/devel
Priority: extra
Architecture: any
-Depends: lame (= ${binary:Version}),
- lame-utils (= ${binary:Version}),
- libmp3lame0 (= ${binary:Version}),
- libmp3lame-dev (= ${binary:Version}),
- ${misc:Depends}
+Depends: lame (= ${binary:Version}), libmp3lame0 (= ${binary:Version}), libmp3lame-dev (= ${binary:Version}), ${misc:Depends}
Description: MPEG Audio Layer III (MP3) encoder (debug)
This is an educational tool to be used for learning about MP3 encoding. The
goal of the LAME project is to use the open source model to improve the psycho
@@ -57,23 +46,20 @@
.
This package contains the debug symbols.
-Package: lame-utils
-Section: restricted/sound
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: MPEG Audio Layer III (MP3) encoder (utilities)
+Package: lame-doc
+Section: restricted/doc
+Architecture: all
+Description: MPEG Audio Layer III (MP3) encoder (documentation)
This is an educational tool to be used for learning about MP3 encoding. The
goal of the LAME project is to use the open source model to improve the psycho
acoustics, noise shaping and speed of MP3.
.
- This package contains additional utilities.
+ This package contains the documentation.
Package: libmp3lame0
Section: restricted/libs
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MPEG Audio Layer III (MP3) encoder (library)
This is an educational tool to be used for learning about MP3 encoding. The
goal of the LAME project is to use the open source model to improve the psycho
@@ -84,8 +70,7 @@
Package: libmp3lame-dev
Section: restricted/libdevel
Architecture: any
-Depends: libmp3lame0 (= ${binary:Version}),
- ${misc:Depends}
+Depends: libmp3lame0 (= ${binary:Version}), ${misc:Depends}
Description: MPEG Audio Layer III (MP3) encoder (development)
This is an educational tool to be used for learning about MP3 encoding. The
goal of the LAME project is to use the open source model to improve the psycho
Added: dists/trunk/lame/debian/lame-dbg.lintian-overrides
===================================================================
--- dists/trunk/lame/debian/lame-dbg.lintian-overrides (rev 0)
+++ dists/trunk/lame/debian/lame-dbg.lintian-overrides 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+lame-dbg: unknown-section restricted/devel
Added: dists/trunk/lame/debian/lame-doc.docs
===================================================================
--- dists/trunk/lame/debian/lame-doc.docs (rev 0)
+++ dists/trunk/lame/debian/lame-doc.docs 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1,6 @@
+API
+HACKING
+README
+STYLEGUIDE
+TODO
+USAGE
Added: dists/trunk/lame/debian/lame-doc.examples
===================================================================
--- dists/trunk/lame/debian/lame-doc.examples (rev 0)
+++ dists/trunk/lame/debian/lame-doc.examples 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+misc/
Added: dists/trunk/lame/debian/lame-doc.install
===================================================================
--- dists/trunk/lame/debian/lame-doc.install (rev 0)
+++ dists/trunk/lame/debian/lame-doc.install 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+/usr/share/doc/
Added: dists/trunk/lame/debian/lame-doc.lintian-overrides
===================================================================
--- dists/trunk/lame/debian/lame-doc.lintian-overrides (rev 0)
+++ dists/trunk/lame/debian/lame-doc.lintian-overrides 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+lame-doc: unknown-section restricted/doc
Deleted: dists/trunk/lame/debian/lame-utils.install
===================================================================
--- dists/trunk/lame/debian/lame-utils.install 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/lame-utils.install 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,2 +0,0 @@
-/usr/bin/mp3rtp
-/usr/bin/mp3x
Deleted: dists/trunk/lame/debian/lame-utils.menu
===================================================================
--- dists/trunk/lame/debian/lame-utils.menu 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/lame-utils.menu 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,5 +0,0 @@
-?package(lame-utils):needs="X11" section="Applications/Sound"\
- title="mp3rtp" command="/usr/bin/mp3rtp"
-
-?package(lame-utils):needs="X11" section="Applications/Sound"\
- title="mp3x" command="/usr/bin/mp3x"
Deleted: dists/trunk/lame/debian/lame.docs
===================================================================
--- dists/trunk/lame/debian/lame.docs 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/lame.docs 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,6 +0,0 @@
-API
-HACKING
-README
-STYLEGUIDE
-TODO
-USAGE
Modified: dists/trunk/lame/debian/lame.install
===================================================================
--- dists/trunk/lame/debian/lame.install 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/lame.install 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,2 +1,2 @@
-/usr/bin/lame
-/usr/share/*
+/usr/bin/
+/usr/share/man/
Added: dists/trunk/lame/debian/lame.lintian-overrides
===================================================================
--- dists/trunk/lame/debian/lame.lintian-overrides (rev 0)
+++ dists/trunk/lame/debian/lame.lintian-overrides 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+lame: unknown-section restricted/sound
Deleted: dists/trunk/lame/debian/lame.menu
===================================================================
--- dists/trunk/lame/debian/lame.menu 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/lame.menu 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,3 +0,0 @@
-?package(lame):needs="text" section="Applications/Sound"\
- title="LAME" longtitle="LAME Ain't an MP3 Encoder"\
- command="/usr/bin/lame"
Modified: dists/trunk/lame/debian/libmp3lame-dev.install
===================================================================
--- dists/trunk/lame/debian/libmp3lame-dev.install 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/libmp3lame-dev.install 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,4 +1,4 @@
-/usr/include/*
+/usr/include/
/usr/lib/*.a
/usr/lib/*.so
/usr/lib/*.la
Added: dists/trunk/lame/debian/libmp3lame-dev.lintian-overrides
===================================================================
--- dists/trunk/lame/debian/libmp3lame-dev.lintian-overrides (rev 0)
+++ dists/trunk/lame/debian/libmp3lame-dev.lintian-overrides 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+libmp3lame-dev: unknown-section restricted/libdevel
Added: dists/trunk/lame/debian/libmp3lame0.lintian-overrides
===================================================================
--- dists/trunk/lame/debian/libmp3lame0.lintian-overrides (rev 0)
+++ dists/trunk/lame/debian/libmp3lame0.lintian-overrides 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1 @@
+libmp3lame0: unknown-section restricted/libs
Added: dists/trunk/lame/debian/patches/01-debian-directory.patch
===================================================================
--- dists/trunk/lame/debian/patches/01-debian-directory.patch (rev 0)
+++ dists/trunk/lame/debian/patches/01-debian-directory.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1,51 @@
+--- lame.orig/Makefile.am
++++ lame/Makefile.am
+@@ -4,7 +4,7 @@
+
+ .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
+
+ CLEANFILES = testcase.new.mp3
+--- lame.orig/configure
++++ lame/configure
+@@ -30627,7 +30627,7 @@
+
+
+
+-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"
+
+
+ cat >confcache <<\_ACEOF
+@@ -31277,7 +31277,6 @@
+ "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+ "Dll/Makefile") CONFIG_FILES="$CONFIG_FILES Dll/Makefile" ;;
+ "misc/Makefile") CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
+- "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+ "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 @@
+
+ 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_OUTPUT
+--- lame.orig/Makefile.in
++++ lame/Makefile.in
+@@ -209,7 +209,7 @@
+ 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
+
+ CLEANFILES = testcase.new.mp3
Deleted: dists/trunk/lame/debian/patches/01_debian-directory.patch
===================================================================
--- dists/trunk/lame/debian/patches/01_debian-directory.patch 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/patches/01_debian-directory.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,54 +0,0 @@
-diff -Nur lame-3.97/configure lame-3.97.new/configure
---- lame-3.97/configure
-+++ lame-3.97.new/configure
-@@ -31034,7 +31034,7 @@
-
-
-
-- ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/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"
-+ ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/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"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -31638,7 +31638,6 @@
- "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- "Dll/Makefile" ) CONFIG_FILES="$CONFIG_FILES Dll/Makefile" ;;
- "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
-- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
- "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" ;;
-diff -Nur lame-3.97/configure.in lame-3.97.new/configure.in
---- lame-3.97/configure.in
-+++ lame-3.97.new/configure.in
-@@ -1088,5 +1088,5 @@
-
- AC_SUBST(CONFIG_DEFS)
-
--AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/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])
-+AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/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])
- AC_OUTPUT
-diff -Nur lame-3.97/Makefile.am lame-3.97.new/Makefile.am
---- lame-3.97/Makefile.am
-+++ lame-3.97.new/Makefile.am
-@@ -4,7 +4,7 @@
-
- .PHONY: test
-
--SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM mac
-+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM mac
-
- CLEANFILES = testcase.new.mp3
-
-diff -Nur lame-3.97/Makefile.in lame-3.97.new/Makefile.in
---- lame-3.97/Makefile.in
-+++ lame-3.97.new/Makefile.in
-@@ -204,7 +204,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = 1.5 foreign $(top_srcdir)/ansi2knr
--SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM mac
-+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM mac
- CLEANFILES = testcase.new.mp3
- EXTRA_DIST = \
- API \
Added: dists/trunk/lame/debian/patches/02-shared-frontend.patch
===================================================================
--- dists/trunk/lame/debian/patches/02-shared-frontend.patch (rev 0)
+++ dists/trunk/lame/debian/patches/02-shared-frontend.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1,22 @@
+--- lame.orig/frontend/Makefile.am
++++ lame/frontend/Makefile.am
+@@ -52,7 +52,7 @@
+ endif
+
+ CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
+
+ INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
+
+--- lame.orig/frontend/Makefile.in
++++ lame/frontend/Makefile.in
+@@ -152,7 +152,7 @@
+ $(top_builddir)/libmp3lame/libmp3lame.la \
+ @FRONTEND_LDADD@
+
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
Deleted: dists/trunk/lame/debian/patches/02_as-needed.patch
===================================================================
--- dists/trunk/lame/debian/patches/02_as-needed.patch 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/patches/02_as-needed.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,12 +0,0 @@
-diff -Nur lame-3.97/libmp3lame/Makefile.in lame-3.97.new/libmp3lame/Makefile.in
---- lame-3.97/libmp3lame/Makefile.in
-+++ lame-3.97.new/libmp3lame/Makefile.in
-@@ -228,7 +228,7 @@
- @HAVE_NASM_TRUE at nasm_ldadd = $(top_builddir)/libmp3lame/@CPUTYPE@/liblameasmroutines.la
- @LIB_WITH_DECODER_FALSE at decoder_ldadd =
- @LIB_WITH_DECODER_TRUE at decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
--libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
-+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
- libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
- -no-undefined
-
Added: dists/trunk/lame/debian/patches/03-manpage-syntax.patch
===================================================================
--- dists/trunk/lame/debian/patches/03-manpage-syntax.patch (rev 0)
+++ dists/trunk/lame/debian/patches/03-manpage-syntax.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1,7 @@
+--- lame.orig/doc/man/lame.1
++++ lame/doc/man/lame.1
+@@ -1221,4 +1221,3 @@
+ mpglib by Michael Hipp
+ Manual page by William Schelter, Nils Faerber, Alexander Leidinger.
+ Small fixes on the manual page by Rogerio Brito.
+-.f
Deleted: dists/trunk/lame/debian/patches/03_shared-frontend.patch
===================================================================
--- dists/trunk/lame/debian/patches/03_shared-frontend.patch 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/patches/03_shared-frontend.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,24 +0,0 @@
-diff -Nur lame-3.97/frontend/Makefile.am lame-3.97.new/frontend/Makefile.am
---- lame-3.97/frontend/Makefile.am
-+++ lame-3.97.new/frontend/Makefile.am
-@@ -52,7 +52,7 @@
- endif
-
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
-
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
-
-diff -Nur lame-3.97/frontend/Makefile.in lame-3.97.new/frontend/Makefile.in
---- lame-3.97/frontend/Makefile.in
-+++ lame-3.97.new/frontend/Makefile.in
-@@ -156,7 +156,7 @@
- $(top_builddir)/libmp3lame/libmp3lame.la \
- @FRONTEND_LDADD@
-
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
Deleted: dists/trunk/lame/debian/patches/04_manpage-syntax.patch
===================================================================
--- dists/trunk/lame/debian/patches/04_manpage-syntax.patch 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/patches/04_manpage-syntax.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,8 +0,0 @@
-diff -Nur lame-3.97/doc/man/lame.1 lame-3.97.new/doc/man/lame.1
---- lame-3.97/doc/man/lame.1
-+++ lame-3.97.new/doc/man/lame.1
-@@ -1230,4 +1230,3 @@
- mpglib by Michael Hipp
- Manual page by William Schelter, Nils Faerber, Alexander Leidinger.
- Small fixes on the manual page by Rogerio Brito.
--.f
Deleted: dists/trunk/lame/debian/patches/05_gcc-4.3.patch
===================================================================
--- dists/trunk/lame/debian/patches/05_gcc-4.3.patch 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/patches/05_gcc-4.3.patch 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,24 +0,0 @@
-diff -Nur lame-3.97/configure lame-3.97.new/configure
---- lame-3.97/configure
-+++ lame-3.97.new/configure
-@@ -30662,7 +30662,7 @@
- # default
- OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} -ffast-math \
- -funroll-loops"
-- OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr -fforce-mem"
-+ OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr"
- ;;
- esac
-
-diff -Nur lame-3.97/configure.in lame-3.97.new/configure.in
---- lame-3.97/configure.in
-+++ lame-3.97.new/configure.in
-@@ -757,7 +757,7 @@
- # default
- OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} -ffast-math \
- -funroll-loops"
-- OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr -fforce-mem"
-+ OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr"
- ;;
- esac
-
Added: dists/trunk/lame/debian/patches/series
===================================================================
--- dists/trunk/lame/debian/patches/series (rev 0)
+++ dists/trunk/lame/debian/patches/series 2008-09-08 14:51:20 UTC (rev 179)
@@ -0,0 +1,3 @@
+01-debian-directory.patch
+02-shared-frontend.patch
+03-manpage-syntax.patch
Modified: dists/trunk/lame/debian/rules
===================================================================
--- dists/trunk/lame/debian/rules 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/rules 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
binary-predeb/lame:: binary-predeb/libmp3lame0
-binary-predeb/lame-utils:: binary-predeb/libmp3lame0
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
@@ -13,26 +12,14 @@
--enable-brhist \
--enable-decode-layer1 \
--enable-expopt=full \
- --enable-mp3rtp \
- --enable-mp3x \
--enable-nasm \
- --with-fileio=lame \
+ --with-fileio=sndfile \
--with-pic
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-binary-install/lame-utils::
- mkdir -p debian/lame-utils/usr/share/lame
- cp -r misc debian/lame-utils/usr/share/lame
- rm -rf debian/lame-utils/usr/share/lame/misc/.deps
-
common-install-impl::
# Installing bug control
for BUG in debian/bug/*; do \
install -D -m 0644 $$BUG debian/`basename $$BUG`/usr/share/bug/`basename $$BUG`/control || exit 1; \
done
-
- # Installing lintian overrides
- for LINTIAN in debian/lintian/*; do \
- install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
- done
Modified: dists/trunk/lame/debian/watch
===================================================================
--- dists/trunk/lame/debian/watch 2008-03-13 08:10:11 UTC (rev 178)
+++ dists/trunk/lame/debian/watch 2008-09-08 14:51:20 UTC (rev 179)
@@ -1,2 +1,4 @@
version=3
+
+opts=dversionmangle=s/\+debian// \
http://sf.net/lame/lame-(.*)\.tar\.gz
More information about the Restricted-changes
mailing list