Hello,
I just uploaded an NMU of bug #652800/#652800 to DELAYED/7. The patch
is attached, it consists of the patch that had earlier been submitted
by Clint Byrum <cl...@ubuntu.com>
-Ralf
--
Ralf Treinen
Laboratoire Preuves, Programmes et Systèmes
Université Paris Diderot, Paris, France.
http://www.pps.jussieu.fr/~treinen/
diff -u sary-ruby-1.2.0/debian/changelog sary-ruby-1.2.0/debian/changelog
--- sary-ruby-1.2.0/debian/changelog
+++ sary-ruby-1.2.0/debian/changelog
@@ -1,3 +1,12 @@
+sary-ruby (1.2.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * add patch 50_fix_multiarch_ftbfs.dpatch to fix location of glib-2.0
+ that changed in the multiarch transition. Thanks a lot to Clint Byrum
+ <cl...@ubuntu.com> for the patch! (closes: #641358, #652800)
+
+ -- Ralf Treinen <trei...@debian.org> Fri, 17 Feb 2012 16:30:23 +0100
+
sary-ruby (1.2.0-3) unstable; urgency=low
* New maintainer. Taking over by sponsor, because I cannot contact to
only in patch2:
unchanged:
--- sary-ruby-1.2.0.orig/debian/patches/50_fix_multiarch_ftbfs.dpatch
+++ sary-ruby-1.2.0/debian/patches/50_fix_multiarch_ftbfs.dpatch
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## 50_fix_multiarch_ftbfs.dpatch.dpatch by Clint Byrum <cl...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fails to build because it can't find glib-2.0
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+=== modified file 'extconf.rb'
+--- a/extconf.rb 2004-01-08 20:13:07 +0000
++++ b/extconf.rb 2011-09-12 18:06:43 +0000
+@@ -15,7 +15,9 @@
+ ENV['PKG_CONFIG_PATH'] = '/usr/local/lib/pkgconfig/'
+ end
+
++$CFLAGS += ' ' + `#{pkg_config} glib-2.0 --cflags`.chomp
+ $CFLAGS += ' ' + `#{pkg_config} sary --cflags`.chomp
++$LDFLAGS += ' ' + `#{pkg_config} glib-2.0 --libs`.chomp
+ $LDFLAGS += ' ' + `#{pkg_config} sary --libs`.chomp
+
+ if have_header('sary.h') &&
+
only in patch2:
unchanged:
--- sary-ruby-1.2.0.orig/debian/patches/00list
+++ sary-ruby-1.2.0/debian/patches/00list
@@ -0,0 +1 @@
+50_fix_multiarch_ftbfs.dpatch
