[SCM] bs1770gain/master: Adjust build rules to version 0.4.3-beta2. Added 30-link-math-lib.diff to get binary linking.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c3a47b046305d775dc4167b632dcaf312a7b3f5
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Jun 15 07:09:08 2015 +0000

    Adjust build rules to version 0.4.3-beta2.  Added 30-link-math-lib.diff to get binary linking.

diff --git a/debian/bs1770gain.install b/debian/bs1770gain.install
index cae4627..f2b345c 100644
--- a/debian/bs1770gain.install
+++ b/debian/bs1770gain.install
@@ -1,2 +1 @@
 usr/bin/bs1770gain
-usr/lib/bs1770gain
diff --git a/debian/changelog b/debian/changelog
index cd4279a..94a672a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bs1770gain (0.4.2-2) UNRELEASED; urgency=medium
+bs1770gain (0.4.3~beta2-1) UNRELEASED; urgency=medium
 
   * 
 
diff --git a/debian/patches/30-link-math-lib.diff b/debian/patches/30-link-math-lib.diff
new file mode 100644
index 0000000..28a9f23
--- /dev/null
+++ b/debian/patches/30-link-math-lib.diff
@@ -0,0 +1,27 @@
+Description: Link with math library.
+Author: Petter Reinholdtsen <pere at debian.org>
+Forwarded: yes
+Reviewed-By: Petter Reinholdtsen <pere at debian.org>
+Last-Update: 2015-06-15
+
+--- bs1770gain-0.4.3-beta2.orig/bs1770gain/Makefile.am
++++ bs1770gain-0.4.3-beta2/bs1770gain/Makefile.am
+@@ -31,6 +31,7 @@ bs1770gain_LDADD+=libbs1770gain.a
+ bs1770gain_LDADD+=$(top_builddir)/libffsox-2/libffsox_2.a
+ bs1770gain_LDADD+=$(top_builddir)/lib1770-2/lib1770_2.a
+ bs1770gain_LDADD+=$(top_builddir)/libpbutil/libpbutil.a
++bs1770gain_LDADD+=-lm
+ 
+ noinst_LIBRARIES=libbs1770gain.a
+ libbs1770gain_a_SOURCES=
+--- bs1770gain-0.4.3-beta2.orig/bs1770gain/Makefile.in
++++ bs1770gain-0.4.3-beta2/bs1770gain/Makefile.in
+@@ -202,7 +202,7 @@ bs1770gain_SOURCES = bs1770gain.c
+ bs1770gain_LDADD = libbs1770gain.a \
+ 	$(top_builddir)/libffsox-2/libffsox_2.a \
+ 	$(top_builddir)/lib1770-2/lib1770_2.a \
+-	$(top_builddir)/libpbutil/libpbutil.a
++	$(top_builddir)/libpbutil/libpbutil.a -lm
+ noinst_LIBRARIES = libbs1770gain.a
+ libbs1770gain_a_SOURCES = bs1770gain.h bs1770gain_priv.h \
+ 	bs1770gain_aggregate.c bs1770gain_album.c bs1770gain_opath.c \
diff --git a/debian/patches/series b/debian/patches/series
index a594e14..a46054c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-10-autotools.diff
-20-disable-dynload.diff
+#10-autotools.diff
+#20-disable-dynload.diff
+30-link-math-lib.diff
diff --git a/debian/rules b/debian/rules
index 1b9b138..c535f07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with autoreconf
-
-# Plase private libraries in private directory
-override_dh_auto_configure:
-	dh_auto_configure -- --libdir=/usr/lib/bs1770gain
+	dh $@
 
 override_dh_strip:
 	dh_strip --dbg-package=bs1770gain-dbg
-
-# Avoid this lintian warning: E: bs1770gain: non-empty-dependency_libs-in-la-file usr/lib/bs1770gain/libffsox-2.la
-override_dh_install:
-	sed -i "/dependency_libs/ s/'.*'/''/" `find -name '*.la'`
-	dh_install
-
-# Avoid this lintian warning: W: bs1770gain: postrm-has-useless-call-to-ldconfig
-override_dh_makeshlibs:
-	dh_makeshlibs -X/usr/lib/bs1770gain
-
-# Hack around the fact that we replace the build system.  Remove the
-# old one and recreate an autotools based system.
-#
-override_dh_autoreconf:
-	if [ ! -f configure.orig ] ; then mv configure configure.orig ; fi
-	for m in Makefile */Makefile ; do [ -e $$m ] && if grep -q config.mak $$m ; then mv $$m $$m.orig; fi; done
-	dh_autoreconf
-override_dh_autoreconf_clean:
-	dh_autoreconf_clean
-	if [ -f configure.orig ] ; then cp configure.orig configure; fi
-override_dh_auto_clean:
-	if [ -f Makefile.am ] && [ -f Makefile ]; then $(MAKE) distclean || true; fi
-	#dh_auto_clean
-	$(RM) *.in */*.in */*.la
-	$(RM) aclocal.m4 ar-lib compile config.guess config.sub depcomp install-sh
-	$(RM) libtool ltmain.sh missing
-	$(RM) m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
-	for m in Makefile */Makefile ; do if [ -e $$m.orig ] && grep -q config.mak $$m.orig ; then cp $$m.orig $$m; fi; done
-	$(RM) config.log config.status
-	$(RM) */*.lo */*.o bs1770gain/bs1770gain
-	$(RM) -r */.libs

-- 
bs1770gain packaging