[Pkg-cli-apps-commits] [SCM] podsleuth branch, master, updated. debian/0.6.4-2-8-g80508b8

[Iain Lane]

The following commit has been merged in the master branch:
commit 2f7d6fb96436a4e236787d5a41f1b092adc71342
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Aug 24 14:03:27 2009 +0100

    debian/control: libsgutils1-dev → libsgutils2-dev.
    
    * debian/control: libsgutils1-dev → libsgutils2-dev.
    * Add 01-sgutils-soname.patch: Update configure check for new libsgutils
      soname.

diff --git a/debian/changelog b/debian/changelog
index 53ed2b7..96a85e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 podsleuth (0.6.4-3) UNRELEASED; urgency=low
 
+  [ Chow Loong Jin ]
   * debian/control:
     + Update Vcs-* to git
 
- -- Chow Loong Jin <hyperair at gmail.com>  Mon, 20 Apr 2009 02:24:37 +0800
+  [ Martin Pitt ]
+  * debian/control: libsgutils1-dev → libsgutils2-dev.
+  * Add 01-sgutils-soname.patch: Update configure check for new libsgutils
+    soname.
+ 
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 13 Jul 2009 08:50:53 +0200
 
 podsleuth (0.6.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2987682..63918e6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5),
  libmono-posix2.0-cil,
  libndesk-dbus1.0-cil (>= 0.4),
  libhal-dev (>= 0.5.6),
- libsgutils1-dev
+ libsgutils2-dev
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/podsleuth.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/podsleuth.git
diff --git a/debian/patches/01-sgutils-soname.patch b/debian/patches/01-sgutils-soname.patch
new file mode 100644
index 0000000..9374d41
--- /dev/null
+++ b/debian/patches/01-sgutils-soname.patch
@@ -0,0 +1,49 @@
+diff -Nur -x '*.orig' -x '*~' podsleuth-0.6.4/configure podsleuth-0.6.4.new/configure
+--- podsleuth-0.6.4/configure	2009-01-20 23:43:04.000000000 +0100
++++ podsleuth-0.6.4.new/configure	2009-07-13 08:58:05.520994982 +0200
+@@ -4392,13 +4392,13 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
+-$as_echo_n "checking for sg_ll_inquiry in -lsgutils... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
++$as_echo_n "checking for sg_ll_inquiry in -lsgutils2... " >&6; }
+ if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsgutils  $LIBS"
++LIBS="-lsgutils2  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4462,11 +4462,11 @@
+ #define HAVE_LIBSGUTILS 1
+ _ACEOF
+ 
+-  LIBS="-lsgutils $LIBS"
++  LIBS="-lsgutils2 $LIBS"
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
+-$as_echo "$as_me: error: Error! You need to have libsgutils." >&2;}
++  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils2." >&5
++$as_echo "$as_me: error: Error! You need to have libsgutils2." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+diff -Nur -x '*.orig' -x '*~' podsleuth-0.6.4/m4/podsleuth.m4 podsleuth-0.6.4.new/m4/podsleuth.m4
+--- podsleuth-0.6.4/m4/podsleuth.m4	2007-12-19 23:37:05.000000000 +0100
++++ podsleuth-0.6.4.new/m4/podsleuth.m4	2009-07-13 08:57:40.636785472 +0200
+@@ -32,8 +32,8 @@
+ 
+ AC_DEFUN([PODSLEUTH_CHECK_SGUTILS],
+ [
+-	AC_CHECK_LIB(sgutils, sg_ll_inquiry, [], 
+-		AC_MSG_ERROR([Error! You need to have libsgutils.])
++	AC_CHECK_LIB(sgutils2, sg_ll_inquiry, [], 
++		AC_MSG_ERROR([Error! You need to have libsgutils2.])
+ 	)
+ ])
+ 

-- 
podsleuth