Bug#749445: Please avoid dependency on tdb when building on the Hurd

[Samuel Thibault]

Jelmer Vernooij, le Tue 27 May 2014 01:46:26 +0200, a écrit :
> Please avoid a build-dependency on libtdb-dev on the Hurd, as tdb depends on
> byte range locking which is not available on the Hurd. See
> http://bugs.debian.org/190367.

I have fixed and NMU-ed the changes to DELAYED/5, attached here.

Samuel
-------------- next part --------------
diff -Nru libcanberra-0.30/debian/changelog libcanberra-0.30/debian/changelog
--- libcanberra-0.30/debian/changelog	2013-05-30 17:14:44.000000000 +0200
+++ libcanberra-0.30/debian/changelog	2014-08-31 22:17:17.000000000 +0200
@@ -1,3 +1,14 @@
+libcanberra (0.30-2.1) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * Non-maintainer upload.
+
+  [ Jelmer Vernooij ]
+  * Remove build-dependency on libtdb-dev on the Hurd, as tdb depends on
+    byte range locking which is not available on the Hurd. Closes: #190367.
+
+ -- Samuel Thibault <sthibault at debian.org>  Sun, 31 Aug 2014 22:17:15 +0200
+
 libcanberra (0.30-2) unstable; urgency=low
 
   * debian/rules: Properly exclude dh_makeshlibs from generating shlibs files
diff -Nru libcanberra-0.30/debian/control libcanberra-0.30/debian/control
--- libcanberra-0.30/debian/control	2013-05-30 17:16:02.000000000 +0200
+++ libcanberra-0.30/debian/control	2014-08-31 22:37:09.000000000 +0200
@@ -19,7 +19,7 @@
                libvorbis-dev,
                libgtk-3-dev (>= 3.0.0),
                libgtk2.0-dev (>= 2.22),
-               libtdb-dev (>> 1.1),
+               libtdb-dev (>> 1.1) [!hurd-any],
                gtk-doc-tools,
                libpulse-dev (>= 0.9.11),
                libgstreamer1.0-dev
diff -Nru libcanberra-0.30/debian/control.in libcanberra-0.30/debian/control.in
--- libcanberra-0.30/debian/control.in	2013-05-30 16:52:04.000000000 +0200
+++ libcanberra-0.30/debian/control.in	2014-08-31 22:25:02.000000000 +0200
@@ -14,7 +14,7 @@
                libvorbis-dev,
                libgtk-3-dev (>= 3.0.0),
                libgtk2.0-dev (>= 2.22),
-               libtdb-dev (>> 1.1),
+               libtdb-dev (>> 1.1) [!hurd-any],
                gtk-doc-tools,
                libpulse-dev (>= 0.9.11),
                libgstreamer1.0-dev
diff -Nru libcanberra-0.30/debian/libcanberra0.symbols.hurd-i386 libcanberra-0.30/debian/libcanberra0.symbols.hurd-i386
--- libcanberra-0.30/debian/libcanberra0.symbols.hurd-i386	1970-01-01 01:00:00.000000000 +0100
+++ libcanberra-0.30/debian/libcanberra0.symbols.hurd-i386	2014-08-31 22:31:49.000000000 +0200
@@ -0,0 +1,72 @@
+libcanberra.so.0 libcanberra0 #MINVER#
+* Build-Depends-Package: libcanberra-dev
+ CANBERRA_0 at CANBERRA_0 0.3
+ ca_context_cache at Base 0.2
+ ca_context_cache_full at Base 0.2
+ ca_context_cancel at Base 0.2
+ ca_context_change_device at Base 0.2
+ ca_context_change_props at Base 0.2
+ ca_context_change_props_full at Base 0.2
+ ca_context_create at Base 0.2
+ ca_context_destroy at Base 0.2
+ ca_context_open at Base 0.2
+ ca_context_play at Base 0.2
+ ca_context_play_full at Base 0.2
+ ca_context_playing at Base 0.16
+ ca_context_set_driver at Base 0.2
+ ca_debug at Base 0.4
+ ca_detect_fork at Base 0.12
+ ca_driver_order at Base 0.4
+ ca_get_data_dirs at Base 0.9
+ ca_get_data_home at Base 0.9
+ ca_lookup_sound at Base 0.2
+ ca_lookup_sound_with_callback at Base 0.8
+ ca_memdup at Base 0.10
+ ca_mutex_free at Base 0.2
+ ca_mutex_lock at Base 0.2
+ ca_mutex_new at Base 0.2
+ ca_mutex_try_lock at Base 0.2
+ ca_mutex_unlock at Base 0.2
+ ca_parse_cache_control at Base 0.2
+ ca_proplist_contains at Base 0.2
+ ca_proplist_create at Base 0.2
+ ca_proplist_destroy at Base 0.2
+ ca_proplist_from_ap at Base 0.2
+ ca_proplist_get_unlocked at Base 0.2
+ ca_proplist_gets_unlocked at Base 0.2
+ ca_proplist_merge at Base 0.2
+ ca_proplist_merge_ap at Base 0.2
+ ca_proplist_set at Base 0.2
+ ca_proplist_setf at Base 0.2
+ ca_proplist_sets at Base 0.2
+ ca_sound_file_close at Base 0.2
+ ca_sound_file_frame_size at Base 0.2
+ ca_sound_file_get_channel_map at Base 0.13
+ ca_sound_file_get_nchannels at Base 0.2
+ ca_sound_file_get_rate at Base 0.2
+ ca_sound_file_get_sample_type at Base 0.2
+ ca_sound_file_get_size at Base 0.2
+ ca_sound_file_open at Base 0.2
+ ca_sound_file_read_arbitrary at Base 0.2
+ ca_sound_file_read_int16 at Base 0.2
+ ca_sound_file_read_uint8 at Base 0.2
+ ca_sprintf_malloc at Base 0.2
+ ca_strerror at Base 0.2
+ ca_theme_data_free at Base 0.2
+ ca_vorbis_close at Base 0.2
+ ca_vorbis_get_channel_map at Base 0.13
+ ca_vorbis_get_nchannels at Base 0.2
+ ca_vorbis_get_rate at Base 0.2
+ ca_vorbis_get_size at Base 0.2
+ ca_vorbis_open at Base 0.2
+ ca_vorbis_read_s16ne at Base 0.2
+ ca_wav_close at Base 0.2
+ ca_wav_get_channel_map at Base 0.13
+ ca_wav_get_nchannels at Base 0.2
+ ca_wav_get_rate at Base 0.2
+ ca_wav_get_sample_type at Base 0.2
+ ca_wav_get_size at Base 0.2
+ ca_wav_open at Base 0.2
+ ca_wav_read_s16le at Base 0.2
+ ca_wav_read_u8 at Base 0.2
+ driver_playing at Base 0.17
diff -Nru libcanberra-0.30/debian/rules libcanberra-0.30/debian/rules
--- libcanberra-0.30/debian/rules	2013-05-30 16:50:38.000000000 +0200
+++ libcanberra-0.30/debian/rules	2014-08-31 22:18:50.000000000 +0200
@@ -13,13 +13,17 @@
 
 common-binary-post-install-arch:: list-missing
 
+ifneq ($(DEB_HOST_ARCH_OS), hurd)
+ENABLE_TDB=--enable-tdb
+endif
+
 DEB_CONFIGURE_EXTRA_FLAGS = 			\
 	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-pulse				\
 	--enable-gstreamer			\
 	--enable-gtk				\
 	--enable-gtk-doc 			\
-	--enable-tdb 				\
+	$(ENABLE_TDB) 				\
 	--with-builtin=dso
 
 # Linux-specific flags: