r444 - zope-common/trunk/debian

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-02 21:57:40 +0100 (Thu, 02 Nov 2006)
New Revision: 444

Modified:
   zope-common/trunk/debian/bash_completion
   zope-common/trunk/debian/changelog
   zope-common/trunk/debian/dirs
   zope-common/trunk/debian/rules
Log:
Changes to move dzhandle from /usr/sbin to /usr/bin.


Modified: zope-common/trunk/debian/bash_completion
===================================================================
--- zope-common/trunk/debian/bash_completion	2006-11-02 20:43:50 UTC (rev 443)
+++ zope-common/trunk/debian/bash_completion	2006-11-02 20:57:40 UTC (rev 444)
@@ -14,7 +14,7 @@
     options='-h --help -v --verbose -f --force -z --zope-versions -u --user -c --config-file'
     actions=$(
 	{
-	    /usr/sbin/dzhandle | grep -e '^actions:' -A 100 | grep -e '^  ' | awk '{print $1;}'
+	    dzhandle | grep -e '^actions:' -A 100 | grep -e '^  ' | awk '{print $1;}'
 	} | sort -u)
 
     ZVER=`echo $COMP_LINE| sed -e 's/.* -z *\([^ ]\+\) .*/-z\1/g' | grep -e '^-'`
@@ -27,7 +27,7 @@
       prev=${COMP_WORDS[i]}
       if [ $(echo "$actions" | sed -e 's/ /\n/g' | grep -e "^$prev$" | wc -l) -eq 1 ]; then
         [ "$prev" != "zopectl" ] && [ "$prev" != "zeoctl" ] && \
-        paroptions=`/usr/sbin/dzhandle $prev --help | grep -e '^  -' | sed -e 's/,//g' | \
+        paroptions=`dzhandle $prev --help | grep -e '^  -' | sed -e 's/,//g' | \
             sed -e 's/ /\n/g' | egrep '^-' | cut -d"=" -f1 | sort | uniq`
         break;
       fi
@@ -61,21 +61,21 @@
          [ "$prev" == "zopectl" ] ; then
             [ "$prev" == "$realprev" ] && \
 	        COMPREPLY=( $(
-		        compgen -W "`/usr/sbin/dzhandle $ZVER list-instances | awk '{print $1}' | sort -u`" | grep "^$cur"
+		        compgen -W "`dzhandle $ZVER list-instances | awk '{print $1}' | sort -u`" | grep "^$cur"
 		    ) )
     elif [ "$prev" == "purge-zeoinstance" ] || [ "$prev" == "show-zeoinstance" ] || [ "$prev" == "zeoctl" ] ; then
             [ "$prev" == "$realprev" ] && \
 	        COMPREPLY=( $(
-		        compgen -W "`/usr/sbin/dzhandle $ZVER list-zeoinstances | awk '{print $1}' | sort -u`" | grep "^$cur"
+		        compgen -W "`dzhandle $ZVER list-zeoinstances | awk '{print $1}' | sort -u`" | grep "^$cur"
 		    ) )
     elif [ "$prev" == "add-product" ] || [ "$prev" == "remove-product" ] ; then
             if [ "$prev" == "$realprev" ] ; then
 	            COMPREPLY=( $(
-		            compgen -W "`/usr/sbin/dzhandle $ZVER list-instances | awk '{print $1}' | sort -u`" | grep "^$cur"
+		            compgen -W "`dzhandle $ZVER list-instances | awk '{print $1}' | sort -u`" | grep "^$cur"
 		        ) )
             else
 	            COMPREPLY=( $(
-		            compgen -W "`/usr/sbin/dzhandle $ZVER list-products| grep -e '^product' | awk '{print $2;}' | sort -u`" | grep "^$cur"
+		            compgen -W "`dzhandle $ZVER list-products| grep -e '^product' | awk '{print $2;}' | sort -u`" | grep "^$cur"
 		        ) )
             fi
     else

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2006-11-02 20:43:50 UTC (rev 443)
+++ zope-common/trunk/debian/changelog	2006-11-02 20:57:40 UTC (rev 444)
@@ -10,8 +10,9 @@
   * dzhandle: use the atechnique from instance if not specified on the
     command-line. (Closes: #382773)
   * debian/po/cs.po: updated. (Closes: #396759)
+  * debian/rules: mv dzhandle from /usr/sbin to /usr/bin. (Closes: #379169)
 
- -- Fabio Tranchitella <kobold at debian.org>  Thu,  2 Nov 2006 21:14:34 +0100
+ -- Fabio Tranchitella <kobold at debian.org>  Thu,  2 Nov 2006 21:44:49 +0100
 
 zope-common (0.5.25) unstable; urgency=low
 

Modified: zope-common/trunk/debian/dirs
===================================================================
--- zope-common/trunk/debian/dirs	2006-11-02 20:43:50 UTC (rev 443)
+++ zope-common/trunk/debian/dirs	2006-11-02 20:57:40 UTC (rev 444)
@@ -1,4 +1,4 @@
 /var/lib/zope
 /etc/apt/apt.conf.d
 /etc/bash_completion.d
-/usr/sbin
+/usr/bin

Modified: zope-common/trunk/debian/rules
===================================================================
--- zope-common/trunk/debian/rules	2006-11-02 20:43:50 UTC (rev 443)
+++ zope-common/trunk/debian/rules	2006-11-02 20:57:40 UTC (rev 444)
@@ -20,7 +20,7 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	cp -p dzhandle debian/zope-common/usr/sbin/dzhandle
+	cp -p dzhandle debian/zope-common/usr/bin/dzhandle
 	docbook-to-man dzhandle.sgml > dzhandle.1
 	cp -p debian/apt.conf \
 		debian/zope-common/etc/apt/apt.conf.d/90zope-common