[SCM] faad2 packaging branch, master, updated. upstream/2.7-34-g94259e5

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d15f5ac0a3a9d24d0314eb86aa5b109a11264132
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 31 20:15:11 2009 -0400

    Patch faad2 to create a shared lib for libmp4ff. (Closes: #485373)

diff --git a/debian/control b/debian/control
index 07628ff..2092410 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,17 @@ Description: freeware Advanced Audio Decoder - runtime files
  .
  This package contains the shared library.
 
+Package: libmp4ff0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: faad2 mp4ff library - shared library
+ FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
+ decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
+ files.
+ .
+ This package contains the shared library for the mp4ff library built from the
+ faad2 source package.
+
 Package: faad2-dbg
 Architecture: any
 Section: debug
diff --git a/debian/libmp4ff-dev.install b/debian/libmp4ff-dev.install
index 9800095..9369cb2 100644
--- a/debian/libmp4ff-dev.install
+++ b/debian/libmp4ff-dev.install
@@ -1,3 +1,3 @@
 usr/include/mp4ff.h
 usr/include/mp4ffint.h
-usr/lib/libmp4ff.a
+usr/lib/libmp4ff.{a,la,so}
diff --git a/debian/libmp4ff0.install b/debian/libmp4ff0.install
new file mode 100644
index 0000000..7d373ef
--- /dev/null
+++ b/debian/libmp4ff0.install
@@ -0,0 +1 @@
+usr/lib/libmp4ff.so.*
diff --git a/debian/patches/libmp4ff-shared-lib.patch b/debian/patches/libmp4ff-shared-lib.patch
new file mode 100644
index 0000000..5670c00
--- /dev/null
+++ b/debian/patches/libmp4ff-shared-lib.patch
@@ -0,0 +1,27 @@
+Patch to create a shared lib for libmp4ff.
+==========================================================================
+--- a/common/mp4ff/Makefile.am
++++ b/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
++lib_LTLIBRARIES = libmp4ff.la
+ include_HEADERS = mp4ff.h mp4ffint.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \
diff --git a/debian/patches/series b/debian/patches/series
index d9dc811..36e0da5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-# Nothing to patch
 manpage.patch
+libmp4ff-shared-lib.patch
diff --git a/debian/rules b/debian/rules
index 3c809b5..2ccde98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,13 @@ endif
 %:
 	dh --with quilt $@
 
+override_dh_auto_configure:
+	aclocal -I .
+	autoheader -f
+	libtoolize --automake --copy -f
+	automake --add-missing --copy -f
+	autoconf -f
+	./configure --prefix=/usr
+
 override_dh_strip:
 	dh_strip --dbg-package=faad2-dbg

-- 
faad2 packaging