[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, master, updated. debian/1.4.20.1-2-3-gefa9ec3

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 61b504eb3de38d0ef212b65c9c054ea5f1e317ca
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Tue Jun 8 23:26:50 2010 +0530

    fix incorrect installation of path /etc/ietd

diff --git a/debian/NEWS b/debian/NEWS
index deac4f3..d5b3e82 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,8 +1,8 @@
 iscsitarget (1.4.20.1-2) unstable; urgency=low
 
-  The following conf file have changed locations from /etc/ to /etc/ietd/
-  * /etc/ietd.conf => /etc/ietd/ietd.conf
-  * /etc/initiators.allow => /etc/ietd/initiators.allow
+  The following conf file have changed locations from /etc/ to /etc/iet/
+  * /etc/ietd.conf => /etc/iet/ietd.conf
+  * /etc/initiators.allow => /etc/iet/initiators.allow
 
   initiators.deny file has been deprecated upstream and thus will not be
   shipped going forward. The old file, if present will still be used.
diff --git a/debian/changelog b/debian/changelog
index dac6340..5d0d7bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+iscsitarget (1.4.20.1-3) unstable; urgency=low
+
+  * Fix incorrect path installation. Correct path is /etc/iet/ 
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Tue, 08 Jun 2010 23:24:11 +0530
+
 iscsitarget (1.4.20.1-2) unstable; urgency=low
 
   * Change address to my official Debian address and remove the DMUA flag
diff --git a/debian/dirs b/debian/dirs
index 88ac795..d09e642 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,2 @@
-etc/ietd
+etc/iet
 usr/sbin
diff --git a/debian/iscsitarget.init b/debian/iscsitarget.init
index f18c3f2..b9d88b6 100644
--- a/debian/iscsitarget.init
+++ b/debian/iscsitarget.init
@@ -10,7 +10,7 @@
 ### END INIT INFO
 
 PID_FILE=/var/run/iscsi_trgt.pid
-CONFIG_FILE=/etc/ietd.conf
+CONFIG_FILE=/etc/iet/ietd.conf
 DAEMON=/usr/sbin/ietd
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/debian/iscsitarget.install b/debian/iscsitarget.install
index 3f69962..f2294dd 100644
--- a/debian/iscsitarget.install
+++ b/debian/iscsitarget.install
@@ -1,5 +1,5 @@
 usr/ietd	/usr/sbin
 usr/ietadm	/usr/sbin
-etc/ietd.conf	/etc/ietd
-etc/initiators.allow	/etc/ietd
-etc/targets.allow	/etc/ietd
+etc/ietd.conf	/etc/iet
+etc/initiators.allow	/etc/iet
+etc/targets.allow	/etc/iet
diff --git a/debian/iscsitarget.overrides b/debian/iscsitarget.overrides
index b3fdb60..b839e5b 100644
--- a/debian/iscsitarget.overrides
+++ b/debian/iscsitarget.overrides
@@ -1 +1 @@
-iscsitarget: non-standard-file-perm etc/ietd/ietd.conf 0600 != 0644
+iscsitarget: non-standard-file-perm etc/iet/ietd.conf 0600 != 0644
diff --git a/debian/iscsitarget.postinst b/debian/iscsitarget.postinst
index e175690..92bd5c1 100644
--- a/debian/iscsitarget.postinst
+++ b/debian/iscsitarget.postinst
@@ -5,18 +5,24 @@ set -e
 case "$1" in
   configure)
 	if [ -f /etc/ietd.conf ]; then
-		mv -f /etc/ietd.conf /etc/ietd/
-		echo "Moving config /etc/ietd.conf to new location /etc/ietd/"
+		mv -f /etc/ietd.conf /etc/iet/
+		echo "Moving config /etc/ietd.conf to new location /etc/iet/"
 	fi
 
 	if [ -f /etc/initiators.allow ]; then
-		mv -f /etc/initiators.allow /etc/ietd/
-		echo "Moving config /etc/initiators.allow to new location /etc/ietd/"
+		mv -f /etc/initiators.allow /etc/iet/
+		echo "Moving config /etc/initiators.allow to new location /etc/iet/"
 	fi
 
 	if [ -f /etc/initiators.deny ]; then
-		mv -f /etc/initiators.deny /etc/ietd/
-		echo "Moving config /etc/initiators.deny to new location /etc/ietd/"
+		mv -f /etc/initiators.deny /etc/iet/
+		echo "Moving config /etc/initiators.deny to new location /etc/iet/"
+	fi
+
+	# Clean up the mess created in the last upload, 1.4.20.1-2
+	if [ -d /etc/ietd ]; then
+		mv -f /etc/ietd/* /etc/iet/
+		rm -f /etc/ietd/
 	fi
   ;;
   abort-upgrade|abort-remove|abort-deconfigure|triggered)
diff --git a/debian/rules b/debian/rules
index 96a7cc9..54aed38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -261,7 +261,7 @@ binary-common:
 	dh_strip
 	dh_compress 
 	dh_fixperms
-	chmod 600 $(CURDIR)/debian/iscsitarget/etc/ietd/ietd.conf
+	chmod 600 $(CURDIR)/debian/iscsitarget/etc/iet/ietd.conf
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps

-- 
Debian iscsitarget packaging