[SCM] Debian packaging of liblinux-lvm-perl branch, master, updated. e0f6032894f936ab1281713b7cb3fbf3e19d0fd7

gregor herrmann gregoa at debian.org
Thu Dec 22 17:40:46 UTC 2011


The following commit has been merged in the master branch:
commit 10d2858f70931fcd754f0fbb6957c84a8b4a8164
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Dec 22 18:30:57 2011 +0100

    Remove patch binaries_in_sbin (fixed upstream), refresh patch zero-size (offset).

diff --git a/debian/patches/binaries_in_sbin b/debian/patches/binaries_in_sbin
deleted file mode 100644
index b0d5536..0000000
--- a/debian/patches/binaries_in_sbin
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: David Bremner <bremner at unb.ca>
-Created: 28 Aug 2008, for Debian version 0.14-1
-Description: Check for lvm utilities in /sbin, matching current lvm2 packages
-Forwarded Upstream: http://rt.cpan.org/Ticket/Display.html?id=38889
---- liblinux-lvm-perl.orig/LVM.pm
-+++ liblinux-lvm-perl/LVM.pm
-@@ -151,8 +151,8 @@
-     my $lvn;
-     my $pvn;
- 
--    if( ! -e "/usr/sbin/vgdisplay" ) { die("LVM utilities not installed in /sbin"); }
--    my @vginfo = `/usr/sbin/vgdisplay -v`;
-+    if( ! -e "/sbin/vgdisplay" ) { die("LVM utilities not installed in /sbin"); }
-+    my @vginfo = `/sbin/vgdisplay -v`;
- 
-     VGINF: foreach(@vginfo) {
-         chomp;
-@@ -361,8 +361,8 @@
-     my %pvhash;
- 
-     if( ! -e "$pvname" ) { die("Physical Disk: $pvname does not exist."); }
--    if( ! -e "/usr/sbin/pvdisplay" ) { die("LVM utilities not installed in /sbin"); }
--    my @pvinfo = `/usr/sbin/pvdisplay $pvname`;
-+    if( ! -e "/sbin/pvdisplay" ) { die("LVM utilities not installed in /sbin"); }
-+    my @pvinfo = `/sbin/pvdisplay $pvname`;
- 
-     PVINF: foreach(@pvinfo) {
-         # Get the name of the physical volume.
-@@ -445,8 +445,8 @@
-     my $lvname = $_[0];
-     my %lvhash;
-     if( ! -e "$lvname" ) { die("Logical Disk: $lvname does not exist."); }
--    if( ! -e "/usr/sbin/lvdisplay" ) { die("LVM utilities not installed in /sbin"); }
--    my @lvinfo = `/usr/sbin/lvdisplay $lvname`;
-+    if( ! -e "/sbin/lvdisplay" ) { die("LVM utilities not installed in /sbin"); }
-+    my @lvinfo = `/sbin/lvdisplay $lvname`;
- 
-     LVINF: foreach(@lvinfo) {
- 
diff --git a/debian/patches/series b/debian/patches/series
index fff20f4..8624513 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-binaries_in_sbin
 zero-size
diff --git a/debian/patches/zero-size b/debian/patches/zero-size
index 534e721..4a77361 100644
--- a/debian/patches/zero-size
+++ b/debian/patches/zero-size
@@ -6,7 +6,7 @@ Forwarded: no
 
 --- a/LVM.pm
 +++ b/LVM.pm
-@@ -240,10 +240,10 @@
+@@ -246,10 +246,10 @@
              next VGINF; }
  
          # Parse the number of allocated physical extents from the volume group.

-- 
Debian packaging of liblinux-lvm-perl



More information about the Pkg-perl-cvs-commits mailing list