[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.3-2-7-g08e9e5d

[David Paleino]

The following commit has been merged in the master branch:
commit 364c98134766aa651e7b57deed6063245d6d23d8
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 25 14:27:14 2011 +0200

    Drop unneeded hacks

diff --git a/debian/compdict b/debian/compdict
deleted file mode 100644
index 036b506..0000000
--- a/debian/compdict
+++ /dev/null
@@ -1,283 +0,0 @@
-completions/_mock:mock|
-completions/_modules:module|
-completions/_subversion:svn|
-completions/_yum:yum|
-completions/_yum-utils:repomanage|
-completions/abook:abook|
-completions/ant:ant|
-completions/ant:complete-ant-cmd.pl|
-completions/apache2ctl:apache2ctl|
-completions/apt:apt-get|
-completions/apt:apt-cache|
-completions/apt-build:apt-build|
-completions/aptitude:aptitude|
-completions/aptitude:grep-status|
-completions/aspell:aspell|
-completions/autoconf:autoconf|
-completions/autoconf:autoreconf|autoheader|
-completions/autoconf:autoscan|autoupdate|
-completions/automake:automake|
-completions/automake:aclocal|
-completions/autorpm:autorpm|
-completions/bind-utils:nslookup|
-completions/bitkeeper:bk|
-completions/bittorrent:btdownloadheadless.py|btdownloadcurses.py|
-completions/bittorrent:btdownloadgui.py|
-completions/bluez:hcitool|
-completions/brctl:brctl|
-completions/bzip2:bzip2|pbzip2|
-completions/cardctl:cardctl|pccardctl|
-completions/cfengine:cfagent|
-completions/chkconfig:chkconfig|
-completions/cksfv:cksfv|
-completions/clisp:clisp|
-completions/coreutils:chown|
-completions/coreutils:chgrp|
-completions/coreutils:id|
-completions/coreutils:mktemp|
-completions/cowsay:cowsay|
-completions/cpan2dist:cpan2dist|
-completions/cpio:cpio|
-completions/crontab:crontab|
-completions/cryptsetup:cryptsetup|
-completions/cups:cancel|
-completions/cvs:cvs|
-completions/cvsps:cvsps|
-completions/dd:dd|
-completions/dhclient:dhclient|
-completions/dict:dict|rdict|
-completions/dpkg:dpkg|
-completions/dpkg:grep-status|
-completions/dpkg:dpkg-reconfigure|
-completions/dpkg:dpkg-source|
-completions/dselect:dselect|
-completions/dsniff:arpspoof|
-completions/dsniff:dnsspoof|
-completions/dsniff:dsniff|
-completions/dsniff:filesnarf|mailsnarf|msgsnarf|
-completions/dsniff:macof|
-completions/dsniff:sshmitm|
-completions/dsniff:sshow|
-completions/dsniff:tcpkill|
-completions/dsniff:tcpnice|
-completions/dsniff:urlsnarf|
-completions/dsniff:webmitm|
-completions/dvd+rw-tools:growisofs|
-completions/e2fsprogs:badblocks|
-completions/e2fsprogs:dumpe2fs|
-completions/e2fsprogs:e2freefrag|
-completions/e2fsprogs:e2label|
-completions/e2fsprogs:filefrag|
-completions/e2fsprogs:tune2fs|
-completions/findutils:find|
-completions/freeciv:civserver|
-completions/freeciv:civclient|
-completions/freerdp:xfreerdp|
-completions/fuse:fusermount|
-completions/gcc:gcc|
-completions/gcl:gcl|
-completions/gdb:gdb|
-completions/genisoimage:mkisofs|genisoimage|
-completions/getent:getent|
-completions/gkrellm:gkrellm|gkrellm2|
-completions/gnatmake:gnatmake|
-completions/gpg:gpg|
-completions/gpg2:gpg2|
-completions/gzip:gzip|pigz|
-completions/heimdal:ktutil|
-completions/hping2:hping|hping2|hping3|
-completions/iconv:iconv|
-completions/iftop:iftop|
-completions/ifupdown:ifup|ifdown|
-completions/ifupdown:ifstatus|
-completions/imagemagick:convert|
-completions/info:info|
-completions/ipmitool:ipmitool|
-completions/iproute2:ip|
-completions/ipsec:ipsec|
-completions/iptables:iptables|
-completions/ipv6calc:ipv6calc|
-completions/isql:isql|
-completions/jar:jar|
-completions/java:java|javac|javadoc|
-completions/java:java|javadoc|
-completions/java:java|
-completions/java:javadoc|
-completions/java:javac|
-completions/java:pack200|
-completions/java:unpack200|
-completions/java:jarsigner|
-completions/java:javaws|
-completions/k3b:k3b|
-completions/larch:larch|
-completions/ldapvi:ldapvi|
-completions/lftp:lftp|
-completions/lftp:lftpget|
-completions/lilo:lilo|
-completions/links:links|
-completions/lintian:lintian|
-completions/lisp:lisp|
-completions/lrzip:lrzip|
-completions/lsof:lsof|
-completions/lvm:lvm|
-completions/lzma:lzma|
-completions/lzop:lzop|
-completions/mailman:list_lists|
-completions/mailman:add_members|
-completions/mailman:remove_members|
-completions/mailman:find_member|
-completions/mailman:clone_member|
-completions/mailman:sync_members|
-completions/mailman:unshunt|
-completions/mailman:list_admins|
-completions/mailman:list_owners|
-completions/mailman:list_members|
-completions/mailman:change_pw|
-completions/mailman:withlist|
-completions/mailman:newlist|
-completions/mailman:rmlist|
-completions/mailman:config_list|
-completions/mailman:mailmanctl|
-completions/mailman:cleanarch|
-completions/mailman:inject|
-completions/mailman:dumpdb|
-completions/mailman:check_db|
-completions/mailman:check_perms|
-completions/mailman:genaliases|
-completions/mailman:mmsitepass|
-completions/mailman:qrunner|
-completions/mailman:mailmanctl|
-completions/make:make|gmake|gnumake|pmake|
-completions/mc:mc|
-completions/mcrypt:mcrypt|mdecrypt|
-completions/mdadm:mdadm|
-completions/medusa:medusa|
-completions/minicom:minicom|
-completions/mkinitrd:mkinitrd|
-completions/module-init-tools:rmmod|
-completions/module-init-tools:insmod|modprobe|modinfo|
-completions/monodevelop:monodevelop|
-completions/monodevelop:mdtool|
-completions/mount:mount|
-completions/mount:umount|
-completions/mplayer:mplayer|
-completions/msynctool:msynctool|
-completions/mtx:mtx|
-completions/munin-node:munin-run|
-completions/munin-node:munindoc|
-completions/munin-node:munin-update|
-completions/munin-node:munin-node-configure|
-completions/mutt:mutt|muttng|
-completions/mysqladmin:mysqladmin|
-completions/ncftp:ncftp|
-completions/net-tools:mii-tool|
-completions/net-tools:mii-diag|
-completions/net-tools:route|
-completions/net-tools:ether-wake|
-completions/nmap:nmap|
-completions/ntpdate:ntpdate|
-completions/open-iscsi:iscsiadm|
-completions/openldap:ldapsearch|
-completions/openssl:openssl|
-completions/p4:p4|
-completions/perl:perl|
-completions/pine:pine|alpine|
-completions/pkg-config:pkg-config|
-completions/pkgtools:removepkg|
-completions/pm-utils:pm-is-supported|
-completions/pm-utils:pm-hibernate|pm-suspend|pm-suspend-hybrid|
-completions/pm-utils:pm-powersave|
-completions/portupgrade:portupgrade|
-completions/portupgrade:portinstall|
-completions/portupgrade:pkg_deinstall|
-completions/postfix:postfix|
-completions/postgresql:psql|
-completions/povray:povray|xpovray|spovray|
-completions/procps:pkill|
-completions/procps:pgrep|
-completions/procps:pgrep|
-completions/python:python|
-completions/qdbus:qdbus|dcop|
-completions/qemu:qemu|
-completions/quota-tools:quota|
-completions/rcs:rcs|
-completions/rdesktop:rdesktop|
-completions/reportbug:reportbug|
-completions/reportbug:querybts|
-completions/resolvconf:resolvconf|
-completions/rfkill:rfkill|
-completions/ri:ri|
-completions/rpcdebug:rpcdebug|
-completions/rpm:rpm|
-completions/rpm:gendiff|
-completions/rpmcheck:rpmcheck|
-completions/rrdtool:rrdtool|
-completions/rsync:rsync|
-completions/rtcwake:rtcwake|
-completions/samba:smbclient|
-completions/sbcl:sbcl|sbcl-mt|
-completions/screen:screen|
-completions/service:service|
-completions/sh:sh|
-completions/shadow:useradd|
-completions/shadow:usermod|
-completions/shadow:userdel|
-completions/shadow:chage|
-completions/shadow:passwd|
-completions/shadow:chpasswd|
-completions/shadow:newusers|
-completions/shadow:pwck|
-completions/shadow:groupadd|
-completions/shadow:groupmod|
-completions/shadow:newgrp|
-completions/shadow:gpasswd|
-completions/shadow:groupmems|
-completions/shadow:grpck|
-completions/shadow:vipw|vigr|
-completions/shadow:faillog|
-completions/shadow:lastlog|
-completions/sitecopy:sitecopy|
-completions/smartctl:smartctl|
-completions/snownews:snownews|
-completions/sqlite3:sqlite3|
-completions/ssh:ssh|
-completions/sshfs:sshfs|
-completions/strace:strace|
-completions/svk:svk|
-completions/sysbench:sysbench|
-completions/sysctl:sysctl|
-completions/sysv-rc:update-rc.d|
-completions/sysv-rc:invoke-rc.d|
-completions/tar:tar|
-completions/tcpdump:tcpdump|
-completions/unace:unace|
-completions/unrar:unrar|
-completions/update-alternatives:update-alternatives|
-completions/util-linux:renice|
-completions/util-linux:kill|
-completions/util-linux:look|
-completions/vncviewer:vncviewer|
-completions/vncviewer:tightvncviewer|
-completions/vncviewer:xvnc4viewer|
-completions/vpnc:vpnc|
-completions/wireless-tools:iwconfig|
-completions/wireless-tools:iwlist|
-completions/wireless-tools:iwspy|
-completions/wireless-tools:iwpriv|
-completions/wodim:cdrecord|wodim|
-completions/wol:wol|
-completions/wtf:wtf|
-completions/wvdial:wvdial|
-completions/xhost:xhost|
-completions/xm:xm|
-completions/xmllint:xmllint|
-completions/xmlwf:xmlwf|
-completions/xmms:xmms|
-completions/xmodmap:xmodmap|
-completions/xrandr:xrandr|
-completions/xrdb:xrdb|
-completions/xsltproc:xsltproc|
-completions/xz:xz|
-completions/xz:xzdec|
-completions/yp-tools:ypcat|
-completions/yum-arch:yum-arch|
diff --git a/debian/extra/cron/bash-completion b/debian/extra/cron/bash-completion
index f91eac6..0e596f1 100755
--- a/debian/extra/cron/bash-completion
+++ b/debian/extra/cron/bash-completion
@@ -2,4 +2,5 @@
 
 [ -x /usr/sbin/update-bash-completion ] || exit 0
 
-/usr/sbin/update-bash-completion clean
+rm -rf /var/lib/bash-completion/*
+/usr/sbin/update-bash-completion
diff --git a/debian/install b/debian/install
index f73bb40..7e7074a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,6 +1,5 @@
 debian/extra/debhelper/dh_bash-completion	/usr/bin/
 debian/extra/debhelper/bash_completion.pm	/usr/share/perl5/Debian/Debhelper/Sequence/
 
-debian/compdict	/usr/share/bash-completion/
 debian/extra/scripts/update-bash-completion	/usr/sbin/
 debian/extra/cron/bash-completion	/etc/cron.monthly/
diff --git a/debian/rules b/debian/rules
index dddd569..761fb58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,29 +13,6 @@ override_dh_auto_configure:
 	[ -d test/log ] || mkdir -p test/log
 	[ -d test/tmp ] || mkdir -p test/tmp
 
-override_dh_auto_build:
-	dh_auto_build
-
-	grep -w "have" completions/* | \
-		grep "have " | \
-		sed -e "s/ || have//g" \
-			-e "s/ ||.*//g" \
-			-e "s/ &&\(^ have\)*//g" \
-			-e "/[ ]*#/d" \
-			-e "s/\[.*\] //g" \
-			-e "s/ {//g" \
-			-e "s/:.*have /:/g" \
-			-e "s/ \\\//g" \
-			-e "s/ complete -F .*//g" \
-			-e "s/;.*//g" \
-			-e "s/ _.*()//g" \
-			-e "s/)//g" \
-			-e "s/ \[.*\]//g" \
-			-e "/.*UNAME.*/d" \
-			-e "s/$$/|/g" | \
-		tr ' ' '|' \
-	> debian/compdict
-
 override_dh_compress:
 	dh_compress -Xcompletions
 

-- 
debian-package