Hi All.
I just changed the contents of the debian directory of the
lame tree a little bit.
It took me a lot of effort and I think that things are a
little better now, but I would like to hear comments from
other people about how well (or how bad) things work now,
especially things regarding the library package. It is working
well for me, at least.
I would appreciate if someone could take this patch and apply
it to the main lame tree or tell me what should be improved
before it is applied. I will do my best to achieve the Right
Thing(tm).
Thank you very much for your excellent software, Roger...
P.S.: Could people carbon copy me the replies? I'm currently not
subscribed to this list. Thanks.
--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Rog�rio Brito - [EMAIL PROTECTED] - http://www.ime.usp.br/~rbrito/
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff -urdN /tmp/lame-3.91/debian/changelog debian/changelog
--- /tmp/lame-3.91/debian/changelog Tue Aug 21 05:57:16 2001
+++ debian/changelog Sun Jan 20 20:50:30 2002
@@ -1,3 +1,27 @@
+lame (3.91-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Rogerio Brito <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Fri, 28 Dec 2001 04:08:57 -0200
+
lame (3.90-1) unstable; urgency=low
* New upstream release.
diff -urdN /tmp/lame-3.91/debian/control debian/control
--- /tmp/lame-3.91/debian/control Tue Aug 21 05:57:16 2001
+++ debian/control Sun Jan 20 20:51:26 2002
@@ -1,17 +1,14 @@
Source: lame
Section: sound
Priority: optional
-Maintainer: Viral <[EMAIL PROTECTED]>
-Build-Depends: nasm, libncurses5-dev, libgtk1.2-dev, xlibs-dev, libglib1.2-dev
-Standards-Version: 3.5.2
+Maintainer: Rogerio Brito <[EMAIL PROTECTED]>
+Build-Depends: nasm [i386], debhelper, libncurses5-dev
+Standards-Version: 3.5.6
Package: lame
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: lame-i686-minimal
-Recommends: lame-extras
-Suggests: abcde
-Description: LAME Ain't an MP3 Encoder
+Description: An 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.
@@ -23,8 +20,9 @@
Package: liblame0
Architecture: any
+Depends: ${shlibs:Depends}
Section: libs
-Description: LAME Ain't an MP3 Encoder
+Description: Shared library 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.
@@ -32,13 +30,12 @@
stdout, use a "-" for <outfile>.
.
This package contains the dynamic library.
-
-Package: lame-dev
+
+Package: liblame0-dev
Architecture: any
Section: devel
Depends: libc6-dev
-Recommends: liblame0
-Description: LAME Ain't an MP3 Encoder
+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.
@@ -46,4 +43,3 @@
stdout, use a "-" for <outfile>.
.
This package contains the static library and header files.
-
diff -urdN /tmp/lame-3.91/debian/copyright debian/copyright
--- /tmp/lame-3.91/debian/copyright Fri Jan 12 17:20:40 2001
+++ debian/copyright Sun Jan 20 20:47:30 2002
@@ -1,7 +1,7 @@
-This package was debianized by Stefan Karrmann <[EMAIL PROTECTED]> on
-Thu, 31 Aug 2000 22:15:07 +0200.
+This package was originally debianized by Stefan Karrmann <[EMAIL PROTECTED]>
+on Thu, 31 Aug 2000 22:15:07 +0200.
-It was downloaded from CVS archive at sourceforge.net.
+It was downloaded from <http://www.mp3dev.org/mp3/>.
Upstream Author(s): see the file html/contributors.html
@@ -21,6 +21,29 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Additionally, the original software's LICENCE file contains the following:
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Can I use LAME in my commercial program?
+
+Yes, you can, under the restrictions of the LGPL. The easiest
+way to do this is to:
+
+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'.
-
diff -urdN /tmp/lame-3.91/debian/lame-dev.docs debian/lame-dev.docs
--- /tmp/lame-3.91/debian/lame-dev.docs Tue Aug 21 05:57:16 2001
+++ debian/lame-dev.docs Wed Dec 31 21:00:00 1969
@@ -1,4 +0,0 @@
-API
-README
-STYLEGUIDE
-HACKING
diff -urdN /tmp/lame-3.91/debian/lame-dev.files debian/lame-dev.files
--- /tmp/lame-3.91/debian/lame-dev.files Fri Jan 12 17:20:40 2001
+++ debian/lame-dev.files Wed Dec 31 21:00:00 1969
@@ -1,2 +0,0 @@
-usr/include/lame/lame.h
-usr/lib/*.{a,la}
diff -urdN /tmp/lame-3.91/debian/lame-extras.files debian/lame-extras.files
--- /tmp/lame-3.91/debian/lame-extras.files Fri Jan 12 17:20:40 2001
+++ debian/lame-extras.files Wed Dec 31 21:00:00 1969
@@ -1,2 +0,0 @@
-usr/bin/mp3rtp
-usr/bin/mp3x
diff -urdN /tmp/lame-3.91/debian/lame.docs debian/lame.docs
--- /tmp/lame-3.91/debian/lame.docs Tue Aug 21 05:57:16 2001
+++ debian/lame.docs Sun Jan 20 20:47:30 2002
@@ -1,7 +1,5 @@
README
-INSTALL
TODO
-LICENSE
PRESETS.draft
USAGE
doc/html
diff -urdN /tmp/lame-3.91/debian/liblame0-dev.docs debian/liblame0-dev.docs
--- /tmp/lame-3.91/debian/liblame0-dev.docs Wed Dec 31 21:00:00 1969
+++ debian/liblame0-dev.docs Sun Jan 20 20:47:30 2002
@@ -0,0 +1,4 @@
+API
+README
+STYLEGUIDE
+HACKING
diff -urdN /tmp/lame-3.91/debian/liblame0-dev.files debian/liblame0-dev.files
--- /tmp/lame-3.91/debian/liblame0-dev.files Wed Dec 31 21:00:00 1969
+++ debian/liblame0-dev.files Sun Jan 20 20:47:30 2002
@@ -0,0 +1,3 @@
+usr/include/lame/lame.h
+usr/lib/*.{a,la}
+usr/lib/libmp3lame.so
diff -urdN /tmp/lame-3.91/debian/liblame0.files debian/liblame0.files
--- /tmp/lame-3.91/debian/liblame0.files Wed Dec 31 21:00:00 1969
+++ debian/liblame0.files Sun Jan 20 20:47:30 2002
@@ -0,0 +1 @@
+usr/lib/libmp3lame.so.*
diff -urdN /tmp/lame-3.91/debian/rules debian/rules
--- /tmp/lame-3.91/debian/rules Tue Aug 21 05:57:16 2001
+++ debian/rules Sun Jan 20 20:47:30 2002
@@ -5,14 +5,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=3
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- ./configure --prefix=/usr --with-fileio=lame --disable-mp3x --enable-mp3rtp
--without-vorbis --host=$$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ ./configure --prefix=/usr --with-fileio=lame --disable-mp3x --disable-mp3rtp
+--disable-analyzer-hooks --without-vorbis --host=$$(dpkg-architecture
+-qDEB_HOST_GNU_TYPE)
touch configure-stamp
@@ -44,7 +44,7 @@
dh_installdirs
# Add here commands to install the package into debian/tmp.
- $(MAKE) DESTDIR=`pwd`/debian/lame install
+ $(MAKE) DESTDIR=`pwd`/debian/tmp install
# Build architecture-independent files here.
@@ -53,19 +53,12 @@
# Build architecture-dependent files here.
binary-arch: build install
-# dh_testversion
dh_testdir
dh_testroot
- dh_movefiles -plame-dev -pliblame0 --sourcedir=./debian/lame
+ dh_movefiles
# dh_installdebconf
dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
- dh_installmanpages -Nliblame0 -Nlame-dev
+ dh_installmanpages -Nliblame0 -Nliblame0-dev
# dh_installinfo
# dh_undocumented -Nlame -Nliblame0 -Nlame-dev mp3rtp.1
dh_installchangelogs ChangeLog
