[Pkg-samba-maint] r2096 - in trunk/ctdb/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-08-01 20:09:42 +0000 (Fri, 01 Aug 2008)
New Revision: 2096

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff
Log:
02_ctdb_diagnostics.diff: keep rpm queries


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2008-08-01 19:51:40 UTC (rev 2095)
+++ trunk/ctdb/debian/changelog	2008-08-01 20:09:42 UTC (rev 2096)
@@ -7,8 +7,9 @@
     * debian/rules: removed get-orig-source target in favour of uscan
     * removed debian/build-orig (was used by get-orig-source target)
   * Updated init script to better match upstream
+  * 02_ctdb_diagnostics.diff: keep rpm queries
 
- -- Mathieu Parent <math.parent at gmail.com>  Fri, 01 Aug 2008 21:51:17 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Fri, 01 Aug 2008 22:07:50 +0200
 
 ctdb (1.0.47+git200807111148-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff
===================================================================
--- trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff	2008-08-01 19:51:40 UTC (rev 2095)
+++ trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff	2008-08-01 20:09:42 UTC (rev 2096)
@@ -8,10 +8,10 @@
 
 Upstream status: specific to debian
 
-Index: ctdb-0~20080104223653/tools/ctdb_diagnostics
+Index: ctdb-1.0.51/tools/ctdb_diagnostics
 ===================================================================
---- ctdb-0~20080104223653.orig/tools/ctdb_diagnostics	2008-01-20 21:45:53.000000000 +0100
-+++ ctdb-0~20080104223653/tools/ctdb_diagnostics	2008-01-20 21:58:10.000000000 +0100
+--- ctdb-1.0.51.orig/tools/ctdb_diagnostics	2008-08-01 22:04:20.000000000 +0200
++++ ctdb-1.0.51/tools/ctdb_diagnostics	2008-08-01 22:05:07.000000000 +0200
 @@ -4,7 +4,7 @@
  
  PATH="$PATH:/sbin:/usr/sbin:/usr/lpp/mmfs/bin"
@@ -21,16 +21,15 @@
  
  2>&1
  
-@@ -90,8 +90,10 @@
- Showing software versions
- EOF
- show_all "uname -a"
--[ -x /bin/rpm ] && {
--    show_all "rpm -qa | egrep 'samba|ctdb|gpfs'"
+@@ -93,6 +93,11 @@
+ [ -x /bin/rpm ] && {
+     show_all "rpm -qa | egrep 'samba|ctdb|gpfs'"
+ }
 +[ -x /usr/bin/dpkg-query ] && {
 +    show_all "/usr/bin/dpkg-query --show 'ctdb'"
 +    show_all "/usr/bin/dpkg-query --show 'samba'"
 +    #show_all "/usr/bin/dpkg-query --show 'gpfs'"
- }
++}
  
  
+ cat <<EOF