[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#807440: patch



Attached.
diff -Nru s390-tools-1.32.0/debian/changelog s390-tools-1.32.0/debian/changelog
--- s390-tools-1.32.0/debian/changelog	2015-10-25 17:12:02.000000000 +0100
+++ s390-tools-1.32.0/debian/changelog	2015-12-08 22:53:28.000000000 +0100
@@ -1,3 +1,9 @@
+s390-tools (1.32.0-2) UNRELEASED; urgency=medium
+
+  * Add lsluns. (Closes: #807440)
+
+ -- dann frazier <dannf@debian.org>  Tue, 08 Dec 2015 22:33:52 +0100
+
 s390-tools (1.32.0-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru s390-tools-1.32.0/debian/control s390-tools-1.32.0/debian/control
--- s390-tools-1.32.0/debian/control	2015-08-16 21:03:16.000000000 +0200
+++ s390-tools-1.32.0/debian/control	2015-12-08 22:31:55.000000000 +0100
@@ -10,6 +10,7 @@
 Package: s390-tools
 Architecture: s390 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}, gawk
+Recommends: sg3-utils
 Description: A set of fundamental utilities for Linux on S/390
  The package contains:
   * dasdfmt, which is used to low-level format ECKD-DASDs with either
diff -Nru s390-tools-1.32.0/debian/patches/series s390-tools-1.32.0/debian/patches/series
--- s390-tools-1.32.0/debian/patches/series	2015-08-16 21:02:26.000000000 +0200
+++ s390-tools-1.32.0/debian/patches/series	2015-12-08 22:36:46.000000000 +0100
@@ -5,3 +5,4 @@
 error-manpages.patch
 zipl-optional.patch
 disable.patch
+sg3-utils.patch
diff -Nru s390-tools-1.32.0/debian/patches/sg3-utils.patch s390-tools-1.32.0/debian/patches/sg3-utils.patch
--- s390-tools-1.32.0/debian/patches/sg3-utils.patch	1970-01-01 01:00:00.000000000 +0100
+++ s390-tools-1.32.0/debian/patches/sg3-utils.patch	2015-12-08 22:47:59.000000000 +0100
@@ -0,0 +1,19 @@
+Description: Fix warning to emit proper sg3-utils package name for Debian
+Author: dann frazier <dannf@debian.org>
+Forwarded: no
+Last-Update: 2015-12-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: s390-tools-1.32.0/zconf/lsluns
+===================================================================
+--- s390-tools-1.32.0.orig/zconf/lsluns
++++ s390-tools-1.32.0/zconf/lsluns
+@@ -321,7 +321,7 @@ push @port, map { @{$res_hash{$_}} } key
+ 
+ # checking for helper progs
+ 
+-die "$PROGRAM_NAME: Unable to execute due to missing sg3_utils package. ".
++die "$PROGRAM_NAME: Unable to execute due to missing sg3-utils package. ".
+     "Processing stopped.\n" if system("sg_luns -V > /dev/null 2>&1");
+ 
+ 
diff -Nru s390-tools-1.32.0/debian/s390-tools.install s390-tools-1.32.0/debian/s390-tools.install
--- s390-tools-1.32.0/debian/s390-tools.install	2014-07-26 23:59:18.000000000 +0200
+++ s390-tools-1.32.0/debian/s390-tools.install	2015-12-08 22:33:40.000000000 +0100
@@ -40,6 +40,10 @@
 /sbin/qethconf
 /usr/share/man/man8/qethconf.8
 
+# lsluns
+/usr/sbin/lsluns
+/usr/share/man/man8/lsluns.8
+
 # tape390
 /sbin/tape390_display
 /usr/share/man/man8/tape390_display.8

Reply to: