[Pkg-bluetooth-commits] r1097 - in /packages/bluez/trunk/debian: changelog control patches/06-alsalib.patch rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Sun Jul 24 12:48:37 2011
New Revision: 1097

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1097
Log:
* Add dh-autoreconf to Build-Depends. To support dh-autoreconf,
  update debian/control and debian/rules.
* Update version and the install path for which libasound depended.
  Add patch/06-alsalib.patch. Thanks for Steve Langasek and Jordi Mallach.
  (Closes: #634976).


Added:
    packages/bluez/trunk/debian/patches/06-alsalib.patch
Modified:
    packages/bluez/trunk/debian/changelog
    packages/bluez/trunk/debian/control
    packages/bluez/trunk/debian/rules

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=1097&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Sun Jul 24 12:48:37 2011
@@ -1,3 +1,13 @@
+bluez (4.94-3) unstable; urgency=low
+
+  * Add dh-autoreconf to Build-Depends. To support dh-autoreconf,
+    update debian/control and debian/rules.
+  * Update version and the install path for which libasound depended.
+    Add patch/06-alsalib.patch. Thanks for Steve Langasek and Jordi Mallach.
+    (Closes: #634976).
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Sun, 24 Jul 2011 18:31:59 +0900
+
 bluez (4.94-2) unstable; urgency=medium
 
   * Add udev to Replaces and Breaks field (Closes: #628904).

Modified: packages/bluez/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/control?rev=1097&op=diff
==============================================================================
--- packages/bluez/trunk/debian/control (original)
+++ packages/bluez/trunk/debian/control Sun Jul 24 12:48:37 2011
@@ -5,15 +5,16 @@
 Uploaders: Andrea Veri <andrea.veri89 at gmail.com>, Nobuhiro Iwamatsu <iwamatsu at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7),
+               dh-autoreconf(>= 4),
                autotools-dev,
                cdbs,
                flex,
                bison,
                gstreamer-tools,
-               libasound2-dev,
+               libasound2-dev (>= 1.0.24.1),
                libdbus-glib-1-dev,
                libglib2.0-dev (>= 2.16),
-			   libgstreamer0.10-dev (>= 0.10.30),
+               libgstreamer0.10-dev (>= 0.10.30),
                libgstreamer-plugins-base0.10-dev (>= 0.10.30),
                libnl-dev,
                libsndfile1-dev,
@@ -130,7 +131,7 @@
  BlueZ 4.x stack.
 
 Package: bluez-audio
-Depends: bluez-alsa (>= 4), bluez-gstreamer (>= 4)
+Depends: bluez-alsa (>= 4.94-3), bluez-gstreamer (>= 4)
 Architecture: all
 Description: Transitional package
  This is a transitional package to assist with moving people to the

Added: packages/bluez/trunk/debian/patches/06-alsalib.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/06-alsalib.patch?rev=1097&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/06-alsalib.patch (added)
+++ packages/bluez/trunk/debian/patches/06-alsalib.patch Sun Jul 24 12:48:37 2011
@@ -1,0 +1,40 @@
+From 66518113dc26fe470510bc44ef113c70c9edb7b9 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Sun, 24 Jul 2011 18:30:08 +0900
+Subject: [PATCH 2/2] alsalib-patch
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+---
+ Makefile.am  |    2 +-
+ acinclude.m4 |    2 ++
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4659c80..afe1da7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -280,7 +280,7 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
+ 
+ 
+ if ALSA
+-alsadir = $(libdir)/alsa-lib
++alsadir = $(ALSA_LIBDIR)/alsa-lib
+ 
+ alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
+ 				audio/libasound_module_ctl_bluetooth.la
+diff --git a/acinclude.m4 b/acinclude.m4
+index d77937b..40e0b40 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -132,6 +132,8 @@ AC_DEFUN([AC_PATH_ALSA], [
+ 	AC_CHECK_LIB(rt, clock_gettime, ALSA_LIBS="$ALSA_LIBS -lrt", alsa_found=no)
+ 	AC_SUBST(ALSA_CFLAGS)
+ 	AC_SUBST(ALSA_LIBS)
++	ALSA_LIBDIR=`$PKG_CONFIG --variable=libdir alsa 2>/dev/null`
++	AC_SUBST(ALSA_LIBDIR)
+ ])
+ 
+ AC_DEFUN([AC_PATH_USB], [
+-- 
+1.7.5.4
+

Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=1097&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Sun Jul 24 12:48:37 2011
@@ -5,7 +5,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
+DEB_DH_AUTORECONF_ARGS = "-ivf"
 DEB_UPDATE_RCD_PARAMS = "start 25 2 3 4 5 . stop 74 0 1 6 ."
 DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-health \