[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-2-14-g1567125

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit a50e986febc12dee04dd8d5cb15a428561a63fd8
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Tue Jan 4 00:50:03 2011 +0545

    drop patches applied upstream

diff --git a/debian/changelog b/debian/changelog
index 482cdca..5f47032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 open-iscsi (2.0.872-1) UNRELEASED; urgency=low
 
   * New Upstream Release (Closes: #603990)
+  * Drop patches. Applied upstream
+    + 001_manpages_fixes.patch
+    + 002_bianry_spelling_error_fix.patch
+    + 003_Fix-CVE-2009-1297.patch
   * Install iscsid.conf with 0600 permission as it can contain passwords
     (Closes: #472965)
   * Provide an example for iSCSI root installation (Closes: #492358) 
@@ -10,7 +14,7 @@ open-iscsi (2.0.872-1) UNRELEASED; urgency=low
   * Add patch to support NICs that have native iSCSI support. Thanks to
     Bjoern Metzdorf for the patch. (Closes: #514924) 
 
- -- Ritesh Raj Sarraf <rrs at debian.org>  Tue, 04 Jan 2011 00:31:22 +0545
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Tue, 04 Jan 2011 00:48:57 +0545
 
 open-iscsi (2.0.871.3-2) unstable; urgency=low
 
diff --git a/debian/patches/004_make-iscsistart-a-dynamic-binary.patch b/debian/patches/004_make-iscsistart-a-dynamic-binary.patch
index 764f474..87af78c 100644
--- a/debian/patches/004_make-iscsistart-a-dynamic-binary.patch
+++ b/debian/patches/004_make-iscsistart-a-dynamic-binary.patch
@@ -7,11 +7,11 @@ Subject: [PATCH 32/43] make iscsistart a dynamic binary
  usr/Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/usr/Makefile b/usr/Makefile
-index 04f7707..cf3d8f5 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -55,7 +55,7 @@ iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
+Index: open-iscsi/usr/Makefile
+===================================================================
+--- open-iscsi.orig/usr/Makefile	2011-01-04 00:30:50.806136105 +0545
++++ open-iscsi/usr/Makefile	2011-01-04 00:47:18.946136106 +0545
+@@ -60,7 +60,7 @@
  
  iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
  		iscsistart.o statics.o
@@ -20,6 +20,3 @@ index 04f7707..cf3d8f5 100644
  clean:
  	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
  
--- 
-1.7.0
-
diff --git a/debian/patches/series b/debian/patches/series
index c533ccb..a660fd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-001_manpages_fixes.patch
-002_bianry_spelling_error_fix.patch
-003_Fix-CVE-2009-1297.patch
 004_make-iscsistart-a-dynamic-binary.patch

-- 
Debian Open-iSCSI Packaging