[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 dac54d1a2e2cb01f2507272ed34c603d224c517b
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Aug 24 14:16:27 2009 +0100

    Update DLLImports/DLLMap for the above transition

diff --git a/debian/changelog b/debian/changelog
index 96a85e7..1b65c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ podsleuth (0.6.4-3) UNRELEASED; urgency=low
   * Add 01-sgutils-soname.patch: Update configure check for new libsgutils
     soname.
  
+  [ Iain Lane ]
+  * Update DLLImports/DLLMap for the above transition 
+
  -- 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/patches/01-sgutils-soname.patch b/debian/patches/01-sgutils-soname.patch
index 9374d41..2d8f19e 100644
--- a/debian/patches/01-sgutils-soname.patch
+++ b/debian/patches/01-sgutils-soname.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur -x '*.orig' -x '*~' podsleuth.git/configure podsleuth.git.new/configure
+--- podsleuth.git/configure	2009-08-24 13:51:28.000000000 +0100
++++ podsleuth.git.new/configure	2009-08-24 14:14:35.000000000 +0100
 @@ -4392,13 +4392,13 @@
  
  
@@ -33,9 +33,9 @@ diff -Nur -x '*.orig' -x '*~' podsleuth-0.6.4/configure podsleuth-0.6.4.new/conf
     { (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
+diff -Nur -x '*.orig' -x '*~' podsleuth.git/m4/podsleuth.m4 podsleuth.git.new/m4/podsleuth.m4
+--- podsleuth.git/m4/podsleuth.m4	2009-07-05 22:24:20.000000000 +0100
++++ podsleuth.git.new/m4/podsleuth.m4	2009-08-24 14:14:35.000000000 +0100
 @@ -32,8 +32,8 @@
  
  AC_DEFUN([PODSLEUTH_CHECK_SGUTILS],
@@ -47,3 +47,31 @@ diff -Nur -x '*.orig' -x '*~' podsleuth-0.6.4/m4/podsleuth.m4 podsleuth-0.6.4.ne
  	)
  ])
  
+diff -Nur -x '*.orig' -x '*~' podsleuth.git/src/PodSleuth/PodSleuth/ScsiReader.cs podsleuth.git.new/src/PodSleuth/PodSleuth/ScsiReader.cs
+--- podsleuth.git/src/PodSleuth/PodSleuth/ScsiReader.cs	2009-07-05 22:24:20.000000000 +0100
++++ podsleuth.git.new/src/PodSleuth/PodSleuth/ScsiReader.cs	2009-08-24 14:15:08.000000000 +0100
+@@ -50,7 +50,7 @@
+             }
+         }
+         
+-        [DllImport("libsgutils.so.1")]
++        [DllImport("libsgutils.so.2")]
+         private static extern int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
+             IntPtr resp, int mx_resp_len, int noisy, int verbose);
+             
+@@ -74,4 +74,4 @@
+             }
+         }
+     }
+-}
+\ No newline at end of file
++}
+diff -Nur -x '*.orig' -x '*~' podsleuth.git/src/PodSleuth/PodSleuth.dll.config.in podsleuth.git.new/src/PodSleuth/PodSleuth.dll.config.in
+--- podsleuth.git/src/PodSleuth/PodSleuth.dll.config.in	2009-07-05 22:24:20.000000000 +0100
++++ podsleuth.git.new/src/PodSleuth/PodSleuth.dll.config.in	2009-08-24 14:14:49.000000000 +0100
+@@ -1,4 +1,4 @@
+ <configuration>
+-	<dllmap dll="libsgutils.so.1" target="libsgutils.so.1" />
++	<dllmap dll="libsgutils.so.2" target="libsgutils.so.2" />
+ </configuration>
+ 

-- 
podsleuth