[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. 2.0.871.3-1-24-ga79a06d

Ritesh Raj Sarraf rrs at researchut.com
Tue Jun 8 18:24:08 UTC 2010


The following commit has been merged in the master branch:
commit b8c0cc8e36303295bfa0fe325d5ffd3991744e21
Merge: 693aa1b5cce2700fc8d342d361b5b9abc65e5d38 ab302efeac15677ce2d8720d36e64f7f1482aea6
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Tue Jun 8 19:08:28 2010 +0530

    Merge branch 'quilt'
    
    * quilt:
      refresh debian/patches/002_bianry_spelling_error_fix.patch
      Revert "refresh patch 001"
      refresh patch 001
      remove quilt calls
      Switch to 3.0 (quilt) source fmt

diff --combined debian/rules
index b19ce6b,f8ccc68..3172836
--- a/debian/rules
+++ b/debian/rules
@@@ -6,8 -6,6 +6,6 @@@
  export DH_OPTIONS
  
  
- include /usr/share/quilt/quilt.make
- 
  # get-orig-source target
  DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
  
@@@ -28,7 -26,6 +26,6 @@@ endi
  configure: configure-stamp
  configure-stamp:
  	dh_testdir
- 	dh_quilt_patch
  	# Add here commands to configure the package.
  
  	touch configure-stamp
@@@ -57,7 -54,6 +54,6 @@@ build-indep-stamp: configure-stam
  clean:
  	dh_testdir
  	dh_testroot
- 	dh_quilt_unpatch
  	rm -f build-arch-stamp build-indep-stamp configure-stamp
  
  	# Add here commands to clean up after the build process.
@@@ -87,7 -83,6 +83,7 @@@ install-arch
  	install -m 755 utils/iscsi-iname $(CURDIR)/debian/open-iscsi/usr/sbin
  	install -m 644 debian/initiatorname.iscsi $(CURDIR)/debian/open-iscsi/etc/iscsi/initiatorname.iscsi
  	install -m 644 etc/iscsid.conf $(CURDIR)/debian/open-iscsi/etc/iscsi
 +	install -m 644 debian/open-iscsi.default $(CURDIR)/debian/open-iscsi/etc/default/open-iscsi
  
  	# initramfs stuff
  	install -m 755 debian/extra/initramfs.hook \

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list