From 431e7dcc3f728abd24e1c17e381f48bbe6eb99dc Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Mon, 25 Apr 2022 22:03:04 +0800 Subject: [PATCH] Import Debian changes 3.100-ok1 lame (3.100-ok1) yangtze; urgency=medium * Build for openKylin. --- debian/.cvsignore | 1 - debian/CVS/Entries | 16 - debian/CVS/Repository | 1 - debian/CVS/Root | 1 - debian/Makefile.am | 20 - debian/Makefile.in | 405 ------------------ debian/README.source | 9 + debian/changelog | 278 +----------- debian/compat | 1 - debian/control | 101 +++-- debian/copyright | 202 +++++++-- debian/gbp.conf | 6 + debian/lame-doc.doc-base | 8 + debian/lame-doc.install | 1 + debian/lame-get-orig-source | 56 +++ debian/lame.doc-base | 9 - debian/lame.docs | 1 - debian/lame.install | 4 +- debian/lame.manpages | 1 - debian/libmp3lame-dev.install | 6 +- debian/libmp3lame0.install | 2 +- debian/libmp3lame0.symbols | 234 ++++++++++ debian/patches/07-field-width-fix.patch | 25 ++ debian/patches/msse.patch | 17 + debian/patches/privacy-breach.patch | 267 ++++++++++++ debian/patches/series | 5 + debian/patches/spelling-error-in-binary.patch | 14 + .../patches/spelling-error-in-manpage.patch | 14 + debian/rules | 18 +- debian/source/CVS/Entries | 2 - debian/source/CVS/Repository | 1 - debian/source/CVS/Root | 1 - debian/watch | 3 +- 33 files changed, 896 insertions(+), 834 deletions(-) delete mode 100644 debian/.cvsignore delete mode 100644 debian/CVS/Entries delete mode 100644 debian/CVS/Repository delete mode 100644 debian/CVS/Root delete mode 100644 debian/Makefile.am delete mode 100644 debian/Makefile.in create mode 100644 debian/README.source delete mode 100644 debian/compat create mode 100644 debian/gbp.conf create mode 100644 debian/lame-doc.doc-base create mode 100644 debian/lame-doc.install create mode 100755 debian/lame-get-orig-source delete mode 100644 debian/lame.doc-base delete mode 100644 debian/lame.docs delete mode 100644 debian/lame.manpages create mode 100644 debian/libmp3lame0.symbols create mode 100644 debian/patches/07-field-width-fix.patch create mode 100644 debian/patches/msse.patch create mode 100644 debian/patches/privacy-breach.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/spelling-error-in-binary.patch create mode 100644 debian/patches/spelling-error-in-manpage.patch mode change 100644 => 100755 debian/rules delete mode 100644 debian/source/CVS/Entries delete mode 100644 debian/source/CVS/Repository delete mode 100644 debian/source/CVS/Root diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/debian/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/debian/CVS/Entries b/debian/CVS/Entries deleted file mode 100644 index 7a99c6b..0000000 --- a/debian/CVS/Entries +++ /dev/null @@ -1,16 +0,0 @@ -/.cvsignore/1.1/Wed Jan 9 12:09:58 2002// -/Makefile.am/1.8/Sat Oct 15 14:31:09 2011// -/Makefile.in/1.27/Sat Oct 15 14:31:09 2011// -/changelog/1.31/Wed Mar 2 16:56:30 2011// -/compat/1.2/Sat May 2 13:44:24 2009// -/control/1.28/Wed Mar 2 16:54:47 2011// -/copyright/1.9/Sat May 7 16:05:17 2011// -/lame.doc-base/1.3/Sun Nov 22 22:09:35 2009// -/lame.docs/1.6/Wed May 14 07:42:04 2008// -/lame.install/1.1/Sat May 2 13:44:24 2009// -/lame.manpages/1.1/Wed Jul 27 08:43:02 2005// -/libmp3lame-dev.install/1.1/Sat May 2 13:44:24 2009// -/libmp3lame0.install/1.1/Sat May 2 13:44:24 2009// -/rules/1.24/Wed Mar 2 16:48:11 2011// -/watch/1.2/Mon Apr 20 05:39:44 2009// -D/source//// diff --git a/debian/CVS/Repository b/debian/CVS/Repository deleted file mode 100644 index 9b41cfa..0000000 --- a/debian/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -lame/debian diff --git a/debian/CVS/Root b/debian/CVS/Root deleted file mode 100644 index 5023546..0000000 --- a/debian/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:ext:aleidinger@lame.cvs.sourceforge.net:/cvsroot/lame diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index 4a23ef5..0000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## $Id: Makefile.am,v 1.8 2011/10/15 14:31:09 robert Exp $ - -include $(top_srcdir)/Makefile.am.global - -EXTRA_DIST = \ - changelog \ - compat \ - control \ - copyright \ - libmp3lame-dev.install \ - libmp3lame0.install \ - lame.docs \ - lame.install \ - lame.manpages \ - rules \ - watch - -dist-hook: - chmod +x $(distdir)/rules - diff --git a/debian/Makefile.in b/debian/Makefile.in deleted file mode 100644 index 24619a7..0000000 --- a/debian/Makefile.in +++ /dev/null @@ -1,405 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# global section for every Makefile.am -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.am.global -subdir = debian -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_DEFS = @CONFIG_DEFS@ -CONFIG_MATH_LIB = @CONFIG_MATH_LIB@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPUCCODE = @CPUCCODE@ -CPUTYPE = @CPUTYPE@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FRONTEND_CFLAGS = @FRONTEND_CFLAGS@ -FRONTEND_LDADD = @FRONTEND_LDADD@ -FRONTEND_LDFLAGS = @FRONTEND_LDFLAGS@ -GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ -GTK_LIBS = @GTK_LIBS@ -INCLUDES = @INCLUDES@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDADD = @LDADD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ -LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEDEP = @MAKEDEP@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NASM_FORMAT = @NASM_FORMAT@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RM_F = @RM_F@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ -SNDFILE_LIBS = @SNDFILE_LIBS@ -STRIP = @STRIP@ -U = @U@ -VERSION = @VERSION@ -WITH_FRONTEND = @WITH_FRONTEND@ -WITH_MP3RTP = @WITH_MP3RTP@ -WITH_MP3X = @WITH_MP3X@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.11 foreign $(top_srcdir)/ansi2knr -EXTRA_DIST = \ - changelog \ - compat \ - control \ - copyright \ - libmp3lame-dev.install \ - libmp3lame0.install \ - lame.docs \ - lame.install \ - lame.manpages \ - rules \ - watch - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.global $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign debian/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am - - -# end global section - -dist-hook: - chmod +x $(distdir)/rules - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..4f2d9c3 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +This package is regenerated from the upstream tarball. The changes made to the +original upstream source are as follows. + +* Removal of upstream's "debian" directory. +* Inclusion of GTK-1 autoconf directives. +* Regeneration of build system using autoreconf. + +All these changes can be automatically done using the "lame-get-orig-source" +script included in the "debian" directory. diff --git a/debian/changelog b/debian/changelog index eed38ca..3d53a40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,277 +1,5 @@ -lame (3.99~cvs20110302) UNRELEASED; urgency=low +lame (3.100-ok1) yangtze; urgency=medium - * New update of the debian infra-structure. - * debian/rules: - + Transition to the short debhelper 7 format. - + Use the --parallel flag so that building in parallel is supported. - * debian/control: - + Rewrap the Build-Depends field for legibility. - + Change B-D on nasm to allow any i386 platform (no amd64, though). - + Update the B-D on debhelper to >= 7.0.50~, as we use overrides in - debian/rules. - + Fix lintian's debhelper-but-no-misc-depends from the binary packages. - + Remove unused Conflicts: and Replaces: fields. - + Verified that the packaging conforms to the Policy version 3.9.1. - * debian/changelog: - + Put my SF email or we get warnings from lintian. + * Build for openKylin. - -- Rogério Brito Wed, 02 Mar 2011 13:31:29 -0300 - -lame (3.99~cvs20091122) unstable; urgency=low - - * Update based on many suggestions by Fabian Greffrath. - * debian/compat: update to 7. - * debian/control: - + remame libmp3lame0-dev to libmp3lame-dev. - + remove dependency on libc6-dev from libmp3lame-dev. - + bump dependency on debhelper to 7. - + bump Standards-Version to 3.8.0. - * debian/libmp3lame0-dev.files: rename to libmp3lame-dev.files. - * debian/*.files: rename to *.install. - * debian/rules: - + replace obsolete dh_clean -k with dh_prep. - + substitute the use of dh_movefiles with dh_install. - + changed the *FLAGS variables to use appends, not attributions. - + include options -O1, -z,defs for the linker. - + no need to pass options to dh_installman. - + no need to pass options to dh_installchangelogs. - * Initial transition to source format "3.0 (quilt)". - - -- Rogério Brito Sun, 22 Nov 2009 19:19:39 -0200 - -lame (3.99~cvs20090419) unstable; urgency=low - - * Updating the packaging of lame. - * debian/control: include autotools-dev as a build dependency. - * debian/rules: - + made use of autotools-dev. - + remove switch --without-vorbis. - + substituted `pwd` by $(CURDIR). - * debian/watch: also consider versions with a letter in them. - - -- Rogério Brito Sun, 19 Apr 2009 20:20:27 -0300 - -lame (3.99~cvs20081106) unstable; urgency=low - - * changes are now (mostly) committed to changelog. - * debian/rules: include -Wl,--as-needed for the loader at compile time. - * debian/rules: remove (not needed) hack for rpath (Tks Fabian Greffrath). - * debian/control: depend libsndfile1-dev (Tks Fabian Greffrath). - * debian/control: get rid of transitional liblame0. - - -- Rogério Brito Sat, 12 Jul 2008 09:14:54 -0300 - -lame (3.98) unstable; urgency=low - - * Preparation for the final release. - - -- Rogério Brito Sun, 29 Jun 2008 18:29:09 -0300 - -lame (3.98~beta8+cvs20080624) unstable; urgency=low - - * Preparation for the new upstream release (lame 3.98 final). - * debian/control: eliminate build dependency on gtk1.2-dev. - * debian/rules: include -Wextra in the CFLAGS variable. - * debian/rules: explicitly disable some features from the build. - - -- Rogério Brito Tue, 24 Jun 2008 15:16:22 -0300 - -lame (3.98~beta8+cvs20080514) unstable; urgency=low - - * Fixing debian packaging details. - * debian/rules: put detection of architectures for cross-compilation. - * debian/rules: included support for noopt option. - * debian/rules: take more care of building everything under debian/tmp. - * debian/control: updated to Standards-Version 3.7.3 (no changes). - * debian/control: put correctly Conflicts: and Replaces in libmp3lame0{,-dev}. - * debian/lame.docs: remove TODO and sort by name. - * debian/libmp3lame0-dev.docs: include TODO. - * debian/libmp3lame0-dev: include liblame0.so in the package. - * debian/watch: include watchfile. - - -- Rogério Brito Wed, 14 May 2008 01:44:46 -0300 - -lame (3.98~alpha1) unstable; urgency=low - - * New upstream release with various improvements; - * Use libsndfile for input files; - * Remove the parts that depend on gtk-1.2; - * debian/rules: remove the DH_COMPAT variable; - * debian/control: use ${binary:Version} to be up-to-date; - * debian/control: use debhelper version >= 5; - - -- Rogério Brito Wed, 09 Jan 2008 17:12:19 -0200 - -lame (3.98~alpha0) unstable; urgency=low - - * debian/copyright: updated FSF real address; - * debian/rules: small fixes; - * doc/man/lame.1: used accented characters in troff format. - - -- Rogério Brito Mon, 10 Oct 2005 03:33:31 -0300 - -lame (3.97-8) unstable; urgency=low - - * debian/rules: enable full optimization, now that it works with GCC 4. - - -- Rogério Brito Mon, 5 Sep 2005 01:24:44 -0300 - -lame (3.97-7) unstable; urgency=low - - * debian/control: make libmp3lame0 provide and replace liblame0. - - -- Rogério Brito Tue, 16 Aug 2005 04:36:46 -0300 - -lame (3.97-6) unstable; urgency=low - - * debian/control: make libmp3lame0 provide liblame0 for legacy apps; - * debian/control: fix typo in description of libmp3lame0-dev; - * debian/libmp3lame0-dev.files: don't ship shared libraries. - - -- Rogério Brito Tue, 16 Aug 2005 04:03:42 -0300 - -lame (3.97-5) unstable; urgency=low - - * debian/control: fix use of SONAME in the package; - * debian/liblame0.*: renamed to libmp3lame0.* as per above; - * debian/liblame-dev: idem; - * debian/rules: incorporate some changes by Christian Marillat. - - -- Rogério Brito Mon, 15 Aug 2005 00:47:25 -0300 - -lame (3.97-4) unstable; urgency=low - - * debian/control: exclude libsndfile0-dev as a build dependency. - * debian/control: include libgtk1.2-dev as a build dependency. - * debian/rules: s/--with-fileio=sndfile/--with-fileio=lame/, since - grabbing input from stdin is a very important feature. - - -- Rogério Brito Fri, 5 Aug 2005 02:01:40 -0300 - -lame (3.97-3) unstable; urgency=low - - * doc/man/lame.1: document the --{un,}signed options. - * doc/man/lame.1: document the --{big,little}-endian options. - * debian/control: include libsndfile0-dev as a build dependency. - * debian/rules: s/--with-fileio=lame/--with-fileio=sndfile/ . - - -- Rogério Brito Wed, 3 Aug 2005 21:35:17 -0300 - -lame (3.97-2) unstable; urgency=low - - * debian/rules: use dh_installman instead of dh_installmanpages. - * doc/man/lame.1: escape minus signals with backslash. - - -- Rogério Brito Wed, 27 Jul 2005 04:58:39 -0300 - -lame (3.97-1) unstable; urgency=low - - * Preparation for the beta release of lame 3.97. - * Still more improvements to come. - - -- Rogério Brito Tue, 26 Jul 2005 18:16:34 -0300 - -lame (3.97-0.2) unstable; urgency=low - - * Fixed debian/control according to the Debian Library Packaging Guide - - -- Jack Bates Thu, 12 May 2005 13:41:28 -0700 - -lame (3.97-0.1) unstable; urgency=low - - * Preparation for new upstream release. - * debian/control: modified short descriptions to be lower case. - - -- Rogério Brito Fri, 18 Mar 2005 01:18:42 -0300 - -lame (3.96-0.1) unstable; urgency=low - - * Update debian packaging for lame 3.96 - - -- Geoffrey T. Dairiki Fri, 9 Apr 2004 10:28:12 -0700 - -lame (3.94-0.1) unstable; urgency=low - - * Update packaging for lame 3.94 alpha 14; - * Made progress to make the package as lintian-clean as possible: - * debian/copyright: removed the traces of the skeleton file; - * debian/rules: avoid using --host, as per warning of ./configure; - * debian/rules: use trick to avoind generating a library with rpath; - * debian/lame.docs: avoid generating duplicate html documentation; - * debian/control: added dependency on debhelper >= 3; - * still more work left, but progressing anyway (i.e., changes listed in - /usr/share/doc/debian-policy/upgrading-checklist.txt.gz should be - applied). - - -- Rogério Brito Tue, 15 Jul 2003 19:30:42 -0300 - -lame (3.93-0.1) unstable; urgency=low - - * Prevent lame 3.93 shipping and still building a 3.92 debian package; - * Use --enable-nasm, as is shouldn't break compilation on non-x86; - * Use --enable-expopt, to get a bit more of speed. - - -- Rogério Brito Sun, 25 Aug 2002 18:58:16 -0300 - -lame (3.92-1) unstable; urgency=low - - * New upstream release. - * Closes: #578135. - - -- Rogério Brito Sun, 28 Jul 2002 03:08:04 -0300 - -lame (3.91-1) unstable; urgency=low - - * New upstream release. - - -- Rogerio Brito Sun, 20 Jan 2002 20:50:19 -0200 - -lame (3.90.1-0) unstable; urgency=low - - * New upstream release. - * debian/control: nasm is only a build-dependency on x86; - * debian/control: added debhelper to build-dependency list; - * debian/control: changed description of the binary packages; - * debian/rules: enabled experimental/agressive optimizations; - * debian/rules: effectively spread the installed files in binary packages; - * debian/rules: now dh_makeshlibs creates good postinst and prerm scripts; - * Changed the lame-dev package to liblame0-dev; - * Removed references to lame-extras, since it doesn't exist anymore; - * Added LICENCE to copyright and excluded it from the binary package; - * Removed INSTALL from the binary package; - * lame is now almost lintian clean (the only problem remaining is - an rpath in liblame build process). - - -- Rogerio Brito Fri, 28 Dec 2001 04:08:57 -0200 - -lame (3.90-1) unstable; urgency=low - - * New upstream release. - - -- Viral Tue, 21 Aug 2001 13:50:14 +0530 - -lame (3.89-1) unstable; urgency=low - - * New upstream version. - * Added --host=$$(dpkg-architecture -qDEB_HOST_GNU_TYPE) to configure. - * Added liblame0 package. - * Added doc-base entry. - * Actual ChangeLog is installed now instead of history.html - - -- Viral Sun, 22 Jul 2001 03:07:30 +0530 - -lame (3.88-0) unstable; urgency=low - - * Updated debian/ directory to use configure. - - -- Ingo Saitz Mon, 11 Dec 2000 08:43:26 +0100 - -lame (3.86-1) unstable; urgency=low - - * Initial Release. - - -- Stefan Karrmann Thu, 31 Aug 2000 22:15:07 +0200 - -Local variables: -mode: debian-changelog -End: + -- openKylinBot Mon, 25 Apr 2022 22:03:04 +0800 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control index 9ef23d6..6892054 100644 --- a/debian/control +++ b/debian/control @@ -1,51 +1,78 @@ Source: lame Section: sound Priority: optional -Maintainer: Rogério Brito -Bugs: mailto:lame-dev@lists.sourceforge.net +Maintainer: Debian Multimedia Maintainers +Uploaders: + Fabian Greffrath , + Reinhard Tartler +Build-Depends: + debhelper-compat (= 12), + libncurses5-dev, + libsndfile1-dev, + nasm [i386], + pkg-config +Standards-Version: 4.4.1 Homepage: http://lame.sourceforge.net/ -Build-Depends: debhelper (>= 7.0.50~), - libncurses5-dev, - nasm [any-i386], - libsndfile1-dev, - autotools-dev -Standards-Version: 3.9.1 +Vcs-Git: https://salsa.debian.org/multimedia-team/lame.git +Vcs-Browser: https://salsa.debian.org/multimedia-team/lame +Rules-Requires-Root: no Package: lame Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: open source MP3 encoder - Lame is a program which can be used to create compressed - audio files. (Lame aint MP3 encoder). These audio files - can be played back by popular mp3 players such as mpg123. - To read from stdin, use "-" for . To write to - stdout, use a "-" for . +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Suggests: + lame-doc +Description: MP3 encoding library (frontend) + LAME (recursive acronym for "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 simple frontend application, + and other tools for sound analysis, as well as convenience tools. . - This package contains the frontend encoder binary. + This package contains the frontend. -Package: libmp3lame0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: shared libraries for MP3 encoding - Lame is a program which can be used to create compressed - audio files. (Lame aint MP3 encoder). These audio files - can be played back by popular mp3 players such as mpg123. - To read from stdin, use "-" for . To write to - stdout, use a "-" for . +Package: lame-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends} +Description: MP3 encoding library (documentation) + LAME (recursive acronym for "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 simple frontend application, + and other tools for sound analysis, as well as convenience tools. . - This package contains the dynamic library. + This package contains the documentation. Package: libmp3lame-dev -Architecture: any Section: libdevel -Depends: libmp3lame0 (= ${binary:Version}), ${misc:Depends} -Description: development files for lame - Lame is a program which can be used to create compressed - audio files. (Lame aint MP3 encoder). These audio files - can be played back by popular mp3 players such as mpg123. - To read from stdin, use "-" for . To write to - stdout, use a "-" for . +Multi-Arch: same +Architecture: any +Depends: + libmp3lame0 (= ${binary:Version}), + ${misc:Depends} +Description: MP3 encoding library (development) + LAME (recursive acronym for "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 simple frontend application, + and other tools for sound analysis, as well as convenience tools. . - This package contains the static library and header files - for development with lame. + This package contains the development files. + +Package: libmp3lame0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: MP3 encoding library + LAME (recursive acronym for "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 simple frontend application, + and other tools for sound analysis, as well as convenience tools. + . + This package contains the shared library. diff --git a/debian/copyright b/debian/copyright index ca4c175..fd07424 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,55 +1,169 @@ -This package was originally made by Stefan Karrmann -on Thu, 31 Aug 2000 22:15:07 +0200. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: LAME +Upstream-Contact: lame-dev@lists.sourceforge.net +Source: http://lame.sourceforge.net/ -The current maintainer is Rogério Brito . +Files: * +Copyright: © 1998, Michael Cheng + © 1999-2001, Mark Taylor + © 1999-2002, Albert L. Faber + © 1999-2005, Takehiro Tominaga + © 1999-2007, The LAME Project + © 2000-2005, Alexander Leidinger + © 2000-2005, Elecard Ltd. + © 2000-2005, Gabriel Bouvigne + © 2000-2005, Marie Orlova + © 2000-2005, Peter Gubanov + © 2000-2005, Vitaly Ivanov + © 2000-2008, Gabriel Bouvigne + © 2000-2008, Robert Hegemann + © 2000, Don Melton + © 2000, Frank Klemm + © 2001-2002, Naoki Shibata + © 2001, John Dahlstrom + © 2001, Jonathan Dee + © 2001, Ralf Kempkens + © 2002, Per Bolmstedt + © 2003, Olcios +License: LGPL-2+ -It was downloaded from the CVS repository at . +Files: ACM/* + libmp3lame/gain_analysis.c + libmp3lame/gain_analysis.h +Copyright: © 2001, David Robinson + © 2001, Glen Sawyer + © 2002, Steve Lhomme + © 2003, Gabriel Bouvigne + © 2003, Milan Cutka +License: LGPL-2.1+ -Upstream Authors: The LAME team . +Files: ACM/tinyxml/* +Copyright: © 2000-2002, Lee Thomason (www.grinninglizard.com) +License: zlib/libpng + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any + damages arising from the use of this software. + . + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation + would be appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source + distribution. -Copyright © 1999-2009 The LAME team and contributors. +Files: ACM/ADbg/* +Copyright: © 2001, Steve Lhomme +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + - Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + - The name of the author may not be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. - LAME is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. +Files: libmp3lame/i386/* +Copyright: © 1999, Keiichi SAKAI + © 1999, shigeo + © 1999, URURI +License: LGPL-2+ +Comment: + Though the license information is not explicitly given, these files are from + an open source MP3 encoder named gogo-no-coda, which is based off of LAME. + The gogo-no-coda developers (the developers mentioned above) have released + their work under LGPL-2. A copy of the source code to gogo-no-coda can be + downloaded from http://homepage2.nifty.com/kei-i/petit/petit313.tgz (as of + 07-26-2011). - LAME is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. +Files: libmp3lame/fft.c +Copyright: © 1988-1993, Ron Mayer + © 1999-2000, Takehiro Tominaga +License: GPL-1+ +Comment: + No version of the GPL is explicitly given. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. +Files: debian/* +Copyright: © 2005-2015, Fabian Greffrath + © 2009-2011, Andres Mejia +License: LGPL-2+ -Additionally, the original software's LICENCE file contains the following: +Files: misc/auenc +Copyright: © 1999, Gerhard Wesp +License: GPL-1+ +Comment: + No version of the GPL is explicitly given. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Can I use LAME in my commercial program? +License: GPL-1+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 1 can be found in `/usr/share/common-licenses/GPL-1'. -Yes, you can, under the restrictions of the LGPL. The easiest -way to do this is to: +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Library General + Public License can be found in `/usr/share/common-licenses/LGPL-2'. -1. Link to LAME as separate library (libmp3lame.a on unix or - lame_enc.dll on windows) - -2. Fully acknowledge that you are using LAME, and give a link - to our web site, www.mp3dev.org - -3. If you make modifications to LAME, you *must* release these - these modifications back to the LAME project, under the LGPL. - -*** IMPORTANT NOTE *** - -The decoding functions provided in LAME use the mpglib decoding engine which -is under the GPL. They may not be used by any program not released under the -GPL unless you obtain such permission from the MPG123 project (www.mpg123.de). -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -On Debian systems, the complete text of the GNU Library General Public -License can be found in `/usr/share/common-licenses/LGPL-2'. - -The Debian packaging is © 2005-2009, Rogério Brito -and is licensed under the GPL, see above. +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..1615f89 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True diff --git a/debian/lame-doc.doc-base b/debian/lame-doc.doc-base new file mode 100644 index 0000000..d37319c --- /dev/null +++ b/debian/lame-doc.doc-base @@ -0,0 +1,8 @@ +Document: lame-doc +Title: LAME documentation +Author: The LAME Project +Section: Sound + +Format: HTML +Index: /usr/share/doc/lame-doc/html/index.html +Files: /usr/share/doc/lame-doc/html/*.html diff --git a/debian/lame-doc.install b/debian/lame-doc.install new file mode 100644 index 0000000..8c1f65c --- /dev/null +++ b/debian/lame-doc.install @@ -0,0 +1 @@ +usr/share/doc/lame/* usr/share/doc/lame-doc diff --git a/debian/lame-get-orig-source b/debian/lame-get-orig-source new file mode 100755 index 0000000..30db1c3 --- /dev/null +++ b/debian/lame-get-orig-source @@ -0,0 +1,56 @@ +#!/bin/sh + +set -e + +# Script used to generate the orig source tarball for lame. + +LAME_UPSTREAM_VERSION="3.99.5" +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="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff" + +# Download and verify lame upstream tarball +test -f "lame-${LAME_UPSTREAM_VERSION}.tar.gz" || wget -c "${LAME_DOWNLOAD_URL}" +COMPUTED_CHECKSUM=`sha256sum "lame-${LAME_UPSTREAM_VERSION}.tar.gz" | cut -d ' ' -f 1` +if [ $LAME_TARBALL_CHECKSUM != $COMPUTED_CHECKSUM ] ; then + echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM +Expected checksum $LAME_TARBALL_CHECKSUM." + exit 1 +else + echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM." +fi +tar -xzf "lame-${LAME_UPSTREAM_VERSION}.tar.gz" +rm -rf "lame-${LAME_VERSION}" +mv "lame-${LAME_UPSTREAM_VERSION}" "lame-${LAME_VERSION}" +cd "lame-${LAME_VERSION}" + +# Modify build system to remove debian directory and include GTK-1 autoconf +# directives. +rm -rf "debian/" +patch -p1 <"../$(dirname $0)/patches/debian-as-extra-dist.patch" +patch -p1 <"../$(dirname $0)/patches/gtk1-ac-directives.patch" +autoreconf -vif +cd .. + +# Remove temp files and other cruft from source tarball +# The find command snippet here was taken from debhelper's dh_clean command +# with some modification to delete more unneeded files. +echo "Removing temp files and other cruft from source tarball" +find lame-${LAME_VERSION} \( \( -type f -a \ + \( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \ + -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \ + -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \ + -o -name TAGS -o \( -path '*/.deps/*' -a -name '*.P' \) \ + -o -name config.status -o -name config.cache -o -name config.log \ + \) -exec rm -f "{}" \; \) -o \ + \( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \) +rm -rf lame-${LAME_VERSION}/.git +rm -f lame-${LAME_VERSION}/.gitignore + +# Remove empty directories +echo "Removing empty directories" +find lame-${LAME_VERSION} -type d -empty -delete + +rm -f "lame_${LAME_VERSION}.orig.tar.gz" +tar --exclude-vcs -czf "lame_${LAME_VERSION}.orig.tar.gz" \ + "lame-${LAME_VERSION}/" diff --git a/debian/lame.doc-base b/debian/lame.doc-base deleted file mode 100644 index 27e8bdf..0000000 --- a/debian/lame.doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: lame -Abstract: This manual describes the LAME MP3 encoder and concepts behind audio compression. -Author: The LAME Development Team -Section: Sound -Title: LAME MP3 encoder manual - -Format: HTML -Index: /usr/share/doc/lame/html/index.html -Files: /usr/share/doc/lame/html/* diff --git a/debian/lame.docs b/debian/lame.docs deleted file mode 100644 index 45d9e7d..0000000 --- a/debian/lame.docs +++ /dev/null @@ -1 +0,0 @@ -USAGE diff --git a/debian/lame.install b/debian/lame.install index 5d06f7f..a65408f 100644 --- a/debian/lame.install +++ b/debian/lame.install @@ -1,2 +1,2 @@ -usr/bin/lame -usr/share/doc/lame/html/*.html +usr/bin +usr/share/man diff --git a/debian/lame.manpages b/debian/lame.manpages deleted file mode 100644 index ba8addd..0000000 --- a/debian/lame.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/man/lame.1 diff --git a/debian/libmp3lame-dev.install b/debian/libmp3lame-dev.install index 7a32f3c..f349901 100644 --- a/debian/libmp3lame-dev.install +++ b/debian/libmp3lame-dev.install @@ -1,3 +1,3 @@ -usr/include/lame/lame.h -usr/lib/*.{a,la} -usr/lib/libmp3lame*.so +usr/include +usr/lib/*/*.a +usr/lib/*/*.so diff --git a/debian/libmp3lame0.install b/debian/libmp3lame0.install index f5235c2..3de3b10 100644 --- a/debian/libmp3lame0.install +++ b/debian/libmp3lame0.install @@ -1 +1 @@ -usr/lib/libmp3lame.so.* +usr/lib/*/*.so.* diff --git a/debian/libmp3lame0.symbols b/debian/libmp3lame0.symbols new file mode 100644 index 0000000..617bbff --- /dev/null +++ b/debian/libmp3lame0.symbols @@ -0,0 +1,234 @@ +libmp3lame.so.0 libmp3lame0 #MINVER# + get_lame_os_bitness@Base 3.100 + get_lame_short_version@Base 3.100 + get_lame_url@Base 3.100 + get_lame_version@Base 3.100 + get_lame_version_numerical@Base 3.100 + get_lame_very_short_version@Base 3.100 + get_psy_version@Base 3.100 + hip_decode1@Base 3.100 + hip_decode1_headers@Base 3.100 + hip_decode1_headersB@Base 3.100 + hip_decode@Base 3.100 + hip_decode_exit@Base 3.100 + hip_decode_headers@Base 3.100 + hip_decode_init@Base 3.100 + hip_set_debugf@Base 3.100 + hip_set_errorf@Base 3.100 + hip_set_msgf@Base 3.100 + id3tag_add_v2@Base 3.100 + id3tag_genre_list@Base 3.100 + id3tag_init@Base 3.100 + id3tag_pad_v2@Base 3.100 + id3tag_set_album@Base 3.100 + id3tag_set_albumart@Base 3.100 + id3tag_set_artist@Base 3.100 + id3tag_set_comment@Base 3.100 + id3tag_set_comment_latin1@Base 3.100 + id3tag_set_comment_ucs2@Base 3.100 + id3tag_set_comment_utf16@Base 3.100 + id3tag_set_fieldvalue@Base 3.100 + id3tag_set_fieldvalue_ucs2@Base 3.100 + id3tag_set_fieldvalue_utf16@Base 3.100 + id3tag_set_genre@Base 3.100 + id3tag_set_pad@Base 3.100 + id3tag_set_textinfo_latin1@Base 3.100 + id3tag_set_textinfo_ucs2@Base 3.100 + id3tag_set_textinfo_utf16@Base 3.100 + id3tag_set_title@Base 3.100 + id3tag_set_track@Base 3.100 + id3tag_set_year@Base 3.100 + id3tag_space_v1@Base 3.100 + id3tag_v1_only@Base 3.100 + id3tag_v2_only@Base 3.100 + lame_bitrate_block_type_hist@Base 3.100 + lame_bitrate_hist@Base 3.100 + lame_bitrate_kbps@Base 3.100 + lame_bitrate_stereo_mode_hist@Base 3.100 + lame_block_type_hist@Base 3.100 + lame_close@Base 3.100 + lame_decode1@Base 3.100 + lame_decode1_headers@Base 3.100 + lame_decode1_headersB@Base 3.100 + lame_decode@Base 3.100 + lame_decode_exit@Base 3.100 + lame_decode_headers@Base 3.100 + lame_decode_init@Base 3.100 + lame_encode_buffer@Base 3.100 + lame_encode_buffer_float@Base 3.100 + lame_encode_buffer_ieee_double@Base 3.100 + lame_encode_buffer_ieee_float@Base 3.100 + lame_encode_buffer_int@Base 3.100 + lame_encode_buffer_interleaved@Base 3.100 + lame_encode_buffer_interleaved_ieee_double@Base 3.100 + lame_encode_buffer_interleaved_ieee_float@Base 3.100 + lame_encode_buffer_interleaved_int@Base 3.100 + lame_encode_buffer_long2@Base 3.100 + lame_encode_buffer_long@Base 3.100 + lame_encode_finish@Base 3.100 + lame_encode_flush@Base 3.100 + lame_encode_flush_nogap@Base 3.100 + lame_get_ATHlower@Base 3.100 + lame_get_ATHonly@Base 3.100 + lame_get_ATHshort@Base 3.100 + lame_get_ATHtype@Base 3.100 + lame_get_AudiophileGain@Base 3.100 + lame_get_PeakSample@Base 3.100 + lame_get_RadioGain@Base 3.100 + lame_get_ReplayGain_decode@Base 3.100 + lame_get_ReplayGain_input@Base 3.100 + lame_get_VBR@Base 3.100 + lame_get_VBR_hard_min@Base 3.100 + lame_get_VBR_max_bitrate_kbps@Base 3.100 + lame_get_VBR_mean_bitrate_kbps@Base 3.100 + lame_get_VBR_min_bitrate_kbps@Base 3.100 + lame_get_VBR_q@Base 3.100 + lame_get_VBR_quality@Base 3.100 + lame_get_allow_diff_short@Base 3.100 + lame_get_analysis@Base 3.100 + lame_get_athaa_loudapprox@Base 3.100 + lame_get_athaa_sensitivity@Base 3.100 + lame_get_athaa_type@Base 3.100 + lame_get_bWriteVbrTag@Base 3.100 + lame_get_bitrate@Base 3.100 + lame_get_brate@Base 3.100 + lame_get_compression_ratio@Base 3.100 + lame_get_copyright@Base 3.100 + lame_get_cwlimit@Base 3.100 + lame_get_decode_on_the_fly@Base 3.100 + lame_get_decode_only@Base 3.100 + lame_get_disable_reservoir@Base 3.100 + lame_get_emphasis@Base 3.100 + lame_get_encoder_delay@Base 3.100 + lame_get_encoder_padding@Base 3.100 + lame_get_error_protection@Base 3.100 + lame_get_exp_nspsytune@Base 3.100 + lame_get_experimentalX@Base 3.100 + lame_get_experimentalY@Base 3.100 + lame_get_experimentalZ@Base 3.100 + lame_get_extension@Base 3.100 + lame_get_findPeakSample@Base 3.100 + lame_get_findReplayGain@Base 3.100 + lame_get_force_ms@Base 3.100 + lame_get_force_short_blocks@Base 3.100 + lame_get_frameNum@Base 3.100 + lame_get_framesize@Base 3.100 + lame_get_free_format@Base 3.100 + lame_get_highpassfreq@Base 3.100 + lame_get_highpasswidth@Base 3.100 + lame_get_id3v1_tag@Base 3.100 + lame_get_id3v2_tag@Base 3.100 + lame_get_in_samplerate@Base 3.100 + lame_get_interChRatio@Base 3.100 + lame_get_lametag_frame@Base 3.100 + lame_get_lowpassfreq@Base 3.100 + lame_get_lowpasswidth@Base 3.100 + lame_get_maximum_number_of_samples@Base 3.100 + lame_get_mf_samples_to_encode@Base 3.100 + lame_get_mode@Base 3.100 + lame_get_mode_automs@Base 3.100 + lame_get_msfix@Base 3.100 + lame_get_noATH@Base 3.100 + lame_get_no_short_blocks@Base 3.100 + lame_get_noclipGainChange@Base 3.100 + lame_get_noclipScale@Base 3.100 + lame_get_nogap_currentindex@Base 3.100 + lame_get_nogap_total@Base 3.100 + lame_get_num_channels@Base 3.100 + lame_get_num_samples@Base 3.100 + lame_get_ogg@Base 3.100 + lame_get_original@Base 3.100 + lame_get_out_samplerate@Base 3.100 + lame_get_padding_type@Base 3.100 + lame_get_quality@Base 3.100 + lame_get_quant_comp@Base 3.100 + lame_get_quant_comp_short@Base 3.100 + lame_get_samplerate@Base 3.100 + lame_get_scale@Base 3.100 + lame_get_scale_left@Base 3.100 + lame_get_scale_right@Base 3.100 + lame_get_size_mp3buffer@Base 3.100 + lame_get_strict_ISO@Base 3.100 + lame_get_totalframes@Base 3.100 + lame_get_useTemporal@Base 3.100 + lame_get_version@Base 3.100 + lame_get_write_id3tag_automatic@Base 3.100 + lame_init@Base 3.100 + lame_init_bitstream@Base 3.100 + lame_init_params@Base 3.100 + lame_mp3_tags_fid@Base 3.100 + lame_print_config@Base 3.100 + lame_print_internals@Base 3.100 + lame_set_ATHlower@Base 3.100 + lame_set_ATHonly@Base 3.100 + lame_set_ATHshort@Base 3.100 + lame_set_ATHtype@Base 3.100 + lame_set_ReplayGain_decode@Base 3.100 + lame_set_ReplayGain_input@Base 3.100 + lame_set_VBR@Base 3.100 + lame_set_VBR_hard_min@Base 3.100 + lame_set_VBR_max_bitrate_kbps@Base 3.100 + lame_set_VBR_mean_bitrate_kbps@Base 3.100 + lame_set_VBR_min_bitrate_kbps@Base 3.100 + lame_set_VBR_q@Base 3.100 + lame_set_VBR_quality@Base 3.100 + lame_set_allow_diff_short@Base 3.100 + lame_set_analysis@Base 3.100 + lame_set_asm_optimizations@Base 3.100 + lame_set_athaa_loudapprox@Base 3.100 + lame_set_athaa_sensitivity@Base 3.100 + lame_set_athaa_type@Base 3.100 + lame_set_bWriteVbrTag@Base 3.100 + lame_set_brate@Base 3.100 + lame_set_compression_ratio@Base 3.100 + lame_set_copyright@Base 3.100 + lame_set_cwlimit@Base 3.100 + lame_set_debugf@Base 3.100 + lame_set_decode_on_the_fly@Base 3.100 + lame_set_decode_only@Base 3.100 + lame_set_disable_reservoir@Base 3.100 + lame_set_emphasis@Base 3.100 + lame_set_error_protection@Base 3.100 + lame_set_errorf@Base 3.100 + lame_set_exp_nspsytune@Base 3.100 + lame_set_experimentalX@Base 3.100 + lame_set_experimentalY@Base 3.100 + lame_set_experimentalZ@Base 3.100 + lame_set_extension@Base 3.100 + lame_set_findPeakSample@Base 3.100 + lame_set_findReplayGain@Base 3.100 + lame_set_force_ms@Base 3.100 + lame_set_force_short_blocks@Base 3.100 + lame_set_free_format@Base 3.100 + lame_set_highpassfreq@Base 3.100 + lame_set_highpasswidth@Base 3.100 + lame_set_in_samplerate@Base 3.100 + lame_set_interChRatio@Base 3.100 + lame_set_lowpassfreq@Base 3.100 + lame_set_lowpasswidth@Base 3.100 + lame_set_mode@Base 3.100 + lame_set_mode_automs@Base 3.100 + lame_set_msfix@Base 3.100 + lame_set_msgf@Base 3.100 + lame_set_noATH@Base 3.100 + lame_set_no_short_blocks@Base 3.100 + lame_set_nogap_currentindex@Base 3.100 + lame_set_nogap_total@Base 3.100 + lame_set_num_channels@Base 3.100 + lame_set_num_samples@Base 3.100 + lame_set_ogg@Base 3.100 + lame_set_original@Base 3.100 + lame_set_out_samplerate@Base 3.100 + lame_set_padding_type@Base 3.100 + lame_set_preset@Base 3.100 + lame_set_preset_expopts@Base 3.100 + lame_set_quality@Base 3.100 + lame_set_quant_comp@Base 3.100 + lame_set_quant_comp_short@Base 3.100 + lame_set_scale@Base 3.100 + lame_set_scale_left@Base 3.100 + lame_set_scale_right@Base 3.100 + lame_set_strict_ISO@Base 3.100 + lame_set_useTemporal@Base 3.100 + lame_set_write_id3tag_automatic@Base 3.100 + lame_stereo_mode_hist@Base 3.100 diff --git a/debian/patches/07-field-width-fix.patch b/debian/patches/07-field-width-fix.patch new file mode 100644 index 0000000..74a1c09 --- /dev/null +++ b/debian/patches/07-field-width-fix.patch @@ -0,0 +1,25 @@ +Description: Fix warning on 64 bit machines. Explicitly set variables as + unsigned ints. +Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches/07-field-width-fix.patch +Forwarded: commit:1.282 +Applied-Upstream: commit:1.282 + +--- a/frontend/parse.c ++++ b/frontend/parse.c +@@ -402,11 +402,11 @@ lame_version_print(FILE * const fp) + const char *b = get_lame_os_bitness(); + const char *v = get_lame_version(); + const char *u = get_lame_url(); +- const size_t lenb = strlen(b); +- const size_t lenv = strlen(v); +- const size_t lenu = strlen(u); +- const size_t lw = 80; /* line width of terminal in characters */ +- const size_t sw = 16; /* static width of text */ ++ const unsigned int lenb = strlen(b); ++ const unsigned int lenv = strlen(v); ++ const unsigned int lenu = strlen(u); ++ const unsigned int lw = 80; /* line width of terminal in characters */ ++ const unsigned int sw = 16; /* static width of text */ + + if (lw >= lenb + lenv + lenu + sw || lw < lenu + 2) + /* text fits in 80 chars per line, or line even too small for url */ diff --git a/debian/patches/msse.patch b/debian/patches/msse.patch new file mode 100644 index 0000000..d3feade --- /dev/null +++ b/debian/patches/msse.patch @@ -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 + +--- a/libmp3lame/vector/Makefile.am ++++ b/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 --git a/debian/patches/privacy-breach.patch b/debian/patches/privacy-breach.patch new file mode 100644 index 0000000..26c6a02 --- /dev/null +++ b/debian/patches/privacy-breach.patch @@ -0,0 +1,267 @@ +Description: Fix privacy-breach lintian error +Author: Sebastian Ramacher +Last-Update: 2014-08-30 + +--- a/doc/html/about.html ++++ b/doc/html/about.html +@@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a + + + + + +- +\ No newline at end of file ++ +--- a/doc/html/cbr.html ++++ b/doc/html/cbr.html +@@ -82,9 +82,9 @@ without scanning and partially decoding + + + + +- +\ No newline at end of file ++ +--- a/doc/html/contact.html ++++ b/doc/html/contact.html +@@ -104,9 +104,9 @@ + + + + +- +\ No newline at end of file ++ +--- a/doc/html/contributors.html ++++ b/doc/html/contributors.html +@@ -169,9 +169,9 @@ + + + + +- +\ No newline at end of file ++ +--- a/doc/html/detailed.html ++++ b/doc/html/detailed.html +@@ -1286,9 +1286,9 @@ so using this switch shouldn't cause har + + + + + + + +- +\ No newline at end of file ++ +--- a/doc/html/list.html ++++ b/doc/html/list.html +@@ -47,9 +47,9 @@ + + + + +- +\ No newline at end of file ++ +--- a/doc/html/ms_stereo.html ++++ b/doc/html/ms_stereo.html +@@ -104,9 +104,9 @@ href="http://en.wikipedia.org/wiki/Joint + + + + +- +\ No newline at end of file ++ +--- a/doc/html/usage.html ++++ b/doc/html/usage.html +@@ -118,9 +118,9 @@ sounds transparent. Use lossless codecs + + + + + +- +\ No newline at end of file ++ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7b6cd06 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +07-field-width-fix.patch +privacy-breach.patch +msse.patch +spelling-error-in-binary.patch +spelling-error-in-manpage.patch diff --git a/debian/patches/spelling-error-in-binary.patch b/debian/patches/spelling-error-in-binary.patch new file mode 100644 index 0000000..07f4d61 --- /dev/null +++ b/debian/patches/spelling-error-in-binary.patch @@ -0,0 +1,14 @@ +Description: Fix a spelling error in the frontend code +Author: Fabian Greffrath + +--- a/frontend/get_audio.c ++++ b/frontend/get_audio.c +@@ -470,7 +470,7 @@ fskip(FILE * fp, long offset, int whence + if (whence != SEEK_CUR || offset < 0) { + if (global_ui_config.silent < 10) { + error_printf +- ("fskip problem: Mostly the return status of functions is not evaluate so it is more secure to polute .\n"); ++ ("fskip problem: Mostly the return status of functions is not evaluate so it is more secure to pollute .\n"); + } + return -1; + } diff --git a/debian/patches/spelling-error-in-manpage.patch b/debian/patches/spelling-error-in-manpage.patch new file mode 100644 index 0000000..6178945 --- /dev/null +++ b/debian/patches/spelling-error-in-manpage.patch @@ -0,0 +1,14 @@ +Description: Fix a spelling error in the frontend manpage +Author: Fabian Greffrath + +--- a/doc/man/lame.1 ++++ b/doc/man/lame.1 +@@ -906,7 +906,7 @@ Your binary may for speed reasons be com + .SH ID3 TAGS + LAME is able to embed ID3 v1, + v1.1 or v2 tags inside the encoded MP3 file. +-This allows to have some useful information about the music track ++This allows one to have some useful information about the music track + included inside the file. + Those data can be read by most MP3 players. + diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index ac7bbd8..8ad21b0 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,14 @@ #!/usr/bin/make -f -%: - dh $@ --parallel +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined -CFLAGS += -g -Wall -Wextra -LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed +%: + dh $@ override_dh_auto_configure: dh_auto_configure -- \ - --with-fileio=sndfile \ - --enable-nasm \ - --with-pic \ - --disable-mp3x \ - --disable-mp3rtp \ - --disable-gtktest \ + --disable-rpath \ --enable-dynamic-frontends \ - --enable-expopt=full + --enable-nasm \ + --with-fileio=sndfile diff --git a/debian/source/CVS/Entries b/debian/source/CVS/Entries deleted file mode 100644 index 82f07e4..0000000 --- a/debian/source/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/format/1.1/Sun Nov 22 21:18:23 2009// -D diff --git a/debian/source/CVS/Repository b/debian/source/CVS/Repository deleted file mode 100644 index f731ac0..0000000 --- a/debian/source/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -lame/debian/source diff --git a/debian/source/CVS/Root b/debian/source/CVS/Root deleted file mode 100644 index 5023546..0000000 --- a/debian/source/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:ext:aleidinger@lame.cvs.sourceforge.net:/cvsroot/lame diff --git a/debian/watch b/debian/watch index f7d69a1..f300ace 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -http://sf.net/lame/lame-(.*).tar.gz +opts=dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg|repack)(.*)$//i,pasv \ +https://sf.net/lame/lame-(\d\.[\.\w]+).tar\.gz