[Pkg-bluetooth-commits] r661 - in /packages/bluez-utils/trunk/debian: bluetooth.override bluez-utils.override changelog control patches/003_configure_amd64_rpath.patch rules

filippo at users.alioth.debian.org filippo at users.alioth.debian.org
Wed Jan 16 17:54:32 UTC 2008 

Author: filippo
Date: Wed Jan 16 17:54:32 2008
New Revision: 661

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=661
Log:
merge from diverged 3.24-1

Added:
    packages/bluez-utils/trunk/debian/bluetooth.override
    packages/bluez-utils/trunk/debian/bluez-utils.override
    packages/bluez-utils/trunk/debian/patches/003_configure_amd64_rpath.patch
Modified:
    packages/bluez-utils/trunk/debian/changelog
    packages/bluez-utils/trunk/debian/control
    packages/bluez-utils/trunk/debian/rules

Added: packages/bluez-utils/trunk/debian/bluetooth.override
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluetooth.override?rev=661&op=file
==============================================================================
--- packages/bluez-utils/trunk/debian/bluetooth.override (added)
+++ packages/bluez-utils/trunk/debian/bluetooth.override Wed Jan 16 17:54:32 2008
@@ -1,0 +1,2 @@
+# package description looks fine, "Bluetooth stack utilities"
+bluetooth binary: description-starts-with-package-name

Added: packages/bluez-utils/trunk/debian/bluez-utils.override
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.override?rev=661&op=file
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.override (added)
+++ packages/bluez-utils/trunk/debian/bluez-utils.override Wed Jan 16 17:54:32 2008
@@ -1,0 +1,2 @@
+# code for moving conffiles
+bluez-utils binary: maintainer-script-uses-dpkg-status-directly preinst

Modified: packages/bluez-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/changelog?rev=661&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/changelog (original)
+++ packages/bluez-utils/trunk/debian/changelog Wed Jan 16 17:54:32 2008
@@ -1,14 +1,22 @@
-bluez-utils (3.24-0exp1) experimental; urgency=low
-
-   The "Could have been the Christmas release" release
-
-  * New upstream version
-  * Enable services inside hcid, replacing old racy daemons
-  * Add bluez-audio package with the audio service and gstreamer plugin
-  * Patch from ubuntu to autostart audio service
+bluez-utils (3.24-2) UNRELEASED; urgency=low
+
+  * Enable services inside hcid, replacing old racy daemons and change init
+    script accordingly
   * Add watch file
 
- -- Filippo Giunchedi <filippo at debian.org>  Sun, 30 Dec 2007 17:20:15 +0100
+ -- Filippo Giunchedi <filippo at debian.org>  Wed, 16 Jan 2008 18:53:24 +0100
+
+bluez-utils (3.24-1) unstable; urgency=low
+
+  * New upstream release, bump build-dep to libbluetooth-dev >= 3.24
+  * Partially pull patch from ubuntu to enable audio support (Closes: #453066)
+  * Split audio support into bluez-audio and make bluez-utils Recommend that
+    (Closes: #452610, #456818)
+  * Install lintian override for conffile handling and bluetooth description
+  * Add debian/patches/003_configure_amd64_rpath.patch for avoiding rpath on
+    amd64
+
+ -- Filippo Giunchedi <filippo at debian.org>  Sun, 13 Jan 2008 11:27:59 +0100
 
 bluez-utils (3.22-2) unstable; urgency=medium
 

Modified: packages/bluez-utils/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/control?rev=661&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/control (original)
+++ packages/bluez-utils/trunk/debian/control Wed Jan 16 17:54:32 2008
@@ -3,16 +3,16 @@
 Priority: optional
 Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
 Uploaders: Edd Dumbill <ejad at debian.org>, Filippo Giunchedi <filippo at debian.org>, Mario Iseli <mario at debian.org>
-Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.24), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev, libasound2-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, gstreamer-tools, libhal-dev, libexpat1-dev
+Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.24), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev, libasound2-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, gstreamer-tools (>= 0.10.14), libhal-dev, libexpat1-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/bluez-utils
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils
 Homepage: http://www.bluez.org
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: bluez-utils
 Architecture: any
 Depends: ${shlibs:Depends}, module-init-tools, makedev (<< 3.3.8.2-0) | udev, lsb-base (>= 3.0-3), dbus
-Recommends: bluez-gnome
+Recommends: bluez-gnome, bluez-audio
 Suggests: bluez-firmware
 Conflicts: bluez-sdp (<= 1.5-2), bluez-pan
 Replaces: bluez-sdp (<= 1.5-2), bluez-pan
@@ -62,6 +62,6 @@
 Architecture: all
 Depends: bluez-utils
 Description: Bluetooth stack utilities
- This metapackage provides the bluez utilities for managing the linux bluetooth
+ This metapackage provides the bluez utilities for managing the Linux bluetooth
  stack for kernels 2.4 and 2.6.
 Tag: special::not-yet-tagged, special::not-yet-tagged::b

Added: packages/bluez-utils/trunk/debian/patches/003_configure_amd64_rpath.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/patches/003_configure_amd64_rpath.patch?rev=661&op=file
==============================================================================
--- packages/bluez-utils/trunk/debian/patches/003_configure_amd64_rpath.patch (added)
+++ packages/bluez-utils/trunk/debian/patches/003_configure_amd64_rpath.patch Wed Jan 16 17:54:32 2008
@@ -1,0 +1,17 @@
+--- configure.orig	2008-01-12 17:10:45.000000000 +0100
++++ configure	2008-01-12 17:11:20.000000000 +0100
+@@ -8593,13 +8593,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on

Modified: packages/bluez-utils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/rules?rev=661&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/rules (original)
+++ packages/bluez-utils/trunk/debian/rules Wed Jan 16 17:54:32 2008
@@ -27,9 +27,13 @@
 		$(DEB_DESTDIR)/usr/share/man/man8/l2ping.8
 
 	install -D -m 0644 $(CURDIR)/debian/passkey-agent-makefile $(CURDIR)/debian/bluez-utils/usr/share/doc/bluez-utils/examples/Makefile
+	install -D -m 0644 $(CURDIR)/debian/bluez-utils.override $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils
 
-install/bluez-audio::
-	dh_gstscancodecs
+install/bluetooth::
+	install -D -m 0644 $(CURDIR)/debian/bluetooth.override $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
+
+binary-install/bluez-audio::
+	dh_gstscancodecs -pbluez-audio
 
 install/bluez-pcmcia-support::
 	cp -f $(CURDIR)/scripts/bluetooth.rules $(CURDIR)/debian/bluez-pcmcia-support.udev

More information about the Pkg-bluetooth-commits mailing list