tags 665052 + patch
tags 665052 + pending
thanks

Dear maintainer,

I've prepared an NMU for cowbell (versioned as 0.2.7.1-6.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Kurt Ostbahn & Die Kombo: 6 x fia nix
diff -u cowbell-0.2.7.1/debian/rules cowbell-0.2.7.1/debian/rules
--- cowbell-0.2.7.1/debian/rules
+++ cowbell-0.2.7.1/debian/rules
@@ -6,6 +6,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-static CSC=/usr/bin/mono-csc
 DEB_INSTALL_MANPAGES_cowbell += debian/cowbell.1
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export MONO_SHARED_DIR=$(CURDIR)
 
diff -u cowbell-0.2.7.1/debian/control cowbell-0.2.7.1/debian/control
--- cowbell-0.2.7.1/debian/control
+++ cowbell-0.2.7.1/debian/control
@@ -16,7 +16,8 @@
  intltool,
  xsltproc,
  docbook-xsl,
- docbook-xml (>= 4.4)
+ docbook-xml (>= 4.4),
+ dpkg-dev (>= 1.16.0)
 Standards-Version: 3.8.3
 Homepage: http://more-cowbell.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/cowbell/trunk
diff -u cowbell-0.2.7.1/debian/changelog cowbell-0.2.7.1/debian/changelog
--- cowbell-0.2.7.1/debian/changelog
+++ cowbell-0.2.7.1/debian/changelog
@@ -1,3 +1,12 @@
+cowbell (0.2.7.1-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: configure: error: 'Taglib C bindings are not installed'":
+    add multiarch patch from Ubuntu / Ilya Barygin.
+    (Closes: #665052)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 07 Apr 2012 13:32:46 +0200
+
 cowbell (0.2.7.1-6) unstable; urgency=low
 
   * No-change rebuild against Mono 2.10.
only in patch2:
unchanged:
--- cowbell-0.2.7.1.orig/debian/patches/multiarch.patch
+++ cowbell-0.2.7.1/debian/patches/multiarch.patch
@@ -0,0 +1,27 @@
+Description: fix FTBFS with multiarch taglib
+Author: Ilya Barygin <randomact...@ubuntu.com>
+
+diff -Nur -x '*.orig' -x '*~' cowbell-0.2.7.1/configure cowbell-0.2.7.1.new/configure
+--- cowbell-0.2.7.1/configure	2006-05-09 06:44:38.000000000 +0400
++++ cowbell-0.2.7.1.new/configure	2012-01-21 18:39:52.000000000 +0400
+@@ -21095,7 +21095,7 @@
+ fi
+ 
+ TAGLIB_PREFIX=`taglib-config --prefix`
+-if test -e "/etc/debian_version" && test ! -e "$TAGLIB_PREFIX/lib/libtag_c.so.0"; then
++if test -e "/etc/debian_version" && test ! -e "$TAGLIB_PREFIX/lib/$DEB_HOST_MULTIARCH/libtag_c.so.0"; then
+ 	{ { echo "$as_me:$LINENO: error: 'Taglib C bindings are not installed'" >&5
+ echo "$as_me: error: 'Taglib C bindings are not installed'" >&2;}
+    { (exit 1); exit 1; }; }
+diff -Nur -x '*.orig' -x '*~' cowbell-0.2.7.1/configure.in cowbell-0.2.7.1.new/configure.in
+--- cowbell-0.2.7.1/configure.in	2006-05-09 06:44:20.000000000 +0400
++++ cowbell-0.2.7.1.new/configure.in	2012-01-21 18:39:28.000000000 +0400
+@@ -55,7 +55,7 @@
+ fi
+ 
+ TAGLIB_PREFIX=`taglib-config --prefix`
+-if test -e "/etc/debian_version" && test ! -e "$TAGLIB_PREFIX/lib/libtag_c.so.0"; then
++if test -e "/etc/debian_version" && test ! -e "$TAGLIB_PREFIX/lib/$DEB_HOST_MULTIARCH/libtag_c.so.0"; then
+ 	AC_MSG_ERROR(['Taglib C bindings are not installed'])
+ fi
+ 

Attachment: signature.asc
Description: Digital signature

Reply via email to