[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 15cc44a67bed824df8d532fa0eac7d1a94d0f773

Ville Skyttä ville.skytta at iki.fi
Sat Mar 20 20:40:23 UTC 2010


The following commit has been merged in the master branch:
commit 15cc44a67bed824df8d532fa0eac7d1a94d0f773
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Mar 20 22:40:00 2010 +0200

    Don't install mock completion by default, it's in upstream mock > 1.1.0.

diff --git a/CHANGES b/CHANGES
index dee82cf..3845158 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,6 +56,7 @@ bash-completion (2.x)
   * Do basic HTML file completion with Firefox and Chrome and friends,
     and Epiphany.
   * Do basic diff/patch completion with cdiff and kompare.
+  * Don't install mock completion by default, it's in upstream mock > 1.1.0.
 
   [ Freddy Vulto ]
   * Added _get_pword() helper function, thanks to Sung Pae (Alioth: #312030)
diff --git a/Makefile.am b/Makefile.am
index 23f5b01..0af9e08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,6 @@ bashcomp_DATA = contrib/abook \
 		contrib/mdadm \
 		contrib/minicom \
 		contrib/mkinitrd \
-		contrib/mock \
 		contrib/monodevelop \
 		contrib/mount \
 		contrib/mplayer \
@@ -165,4 +164,5 @@ bash_completion.sh: bash_completion.sh.in Makefile
 CLEANFILES = bash_completion.sh
 
 EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) bash_completion.sh.in \
-	contrib/_modules contrib/_subversion contrib/_yum contrib/_yum-utils
+	contrib/_mock contrib/_modules contrib/_subversion contrib/_yum \
+	contrib/_yum-utils
diff --git a/contrib/mock b/contrib/_mock
similarity index 96%
rename from contrib/mock
rename to contrib/_mock
index 60a099f..76ecb8a 100644
--- a/contrib/mock
+++ b/contrib/_mock
@@ -1,3 +1,6 @@
+# Use of this file is deprecated.  Upstream completion is available in
+# mock > 1.1.0, use that instead.
+
 # bash completion for mock
 
 have mock &&

-- 
bash-completion



More information about the Bash-completion-commits mailing list