[SCM] bitmeter/master: Import Debian changes 1.2-3.1

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5931df8c43891b717e426e26b124a59b7ec85fc1
Author: Barry deFreese <bdefreese at debian.org>
Date:   Sun Jul 7 04:26:23 2013 -0400

    Import Debian changes 1.2-3.1
    
    bitmeter (1.2-3.1) unstable; urgency=low
    
      * Non-maintainer upload.
      * Link libm. (Closes: #713638).
      * Make VCS tags canonical.

diff --git a/debian/changelog b/debian/changelog
index 39106bf..0613cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bitmeter (1.2-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Link libm. (Closes: #713638).
+  * Make VCS tags canonical.
+
+ -- Barry deFreese <bdefreese at debian.org>  Sun, 07 Jul 2013 04:26:23 -0400
+
 bitmeter (1.2-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 58bed7b..31d08ab 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: cdbs (>= 0.4.72~),
  devscripts (>= 2.10.7~), libasound2-dev [linux-any], libjack-dev, libgtk2.0-dev, docbook-to-man
 Standards-Version: 3.9.2
 Homepage: http://devel.tlrmx.org/audio/
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/bitmeter.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/bitmeter.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/bitmeter.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/bitmeter.git;a=summary
 
 Package: bitmeter
 Provides: bitscope
diff --git a/debian/patches/link_libm.patch b/debian/patches/link_libm.patch
new file mode 100644
index 0000000..b9aecc2
--- /dev/null
+++ b/debian/patches/link_libm.patch
@@ -0,0 +1,16 @@
+Description: Statically link in libm for new toolchain.
+Bug-Debian: http://bugs.debian.org/713638
+Author: Barry deFreese <bdefreese at debian.org>
+Index: bitmeter-1.2/src/Makefile.in
+===================================================================
+--- bitmeter-1.2.orig/src/Makefile.in	2005-08-13 08:29:42.000000000 -0400
++++ bitmeter-1.2/src/Makefile.in	2013-07-07 04:40:19.000000000 -0400
+@@ -172,7 +172,7 @@
+ 	interface.c interface.h \
+ 	callbacks.c callbacks.h
+ 
+-bitmeter_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -ljack
++bitmeter_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -ljack -lm
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d982232
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link_libm.patch

-- 
Bitmeter packaging