* Merge from Gentoo:

- fix CVS completion

bash_completion

@@ -1687,7 +1687,7 @@ _cvs()
 				for i in "${entries[@]}"; do
 					files=( ${files[@]/#$i//} )
 				done
-				COMPREPLY=( $( compgen -W '${files[@]}' -- \
+				COMPREPLY=( $( compgen -X '*~' -W '${files[@]}' -- \
 					       $cur ) )
 			fi
 		else
@@ -1740,7 +1740,7 @@ _cvs()
 				COMPREPLY=( $( compgen -W '${changed[@]:-} \
 						   ${newremoved[@]:-}' -- $cur ) )
 			else
-				_filedir
+				COMPREPLY=( $(compgen $default -- "$cur") )
 			fi
 		else
 			COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \

debian/changelog

@@ -52,13 +52,14 @@ bash-completion (200811xx) UNRELEASED; urgency=low
     - use make -qp to parse the Makefile for us, so we get proper completion
       on things like pattern rules. Patch by Mike Kelly <pioto@exherbo.org>.
     - complete on gkrellm2 as well. Patch by Aaron Walker.
+    - fix CVS completion
   * debian/links fixed (Closes: #494292)
   * debian/control:
     - fixed typo in the long description
   * debian/install:
     - correctly install contrib/* under /etc/bash_completion.d/
 
- -- David Paleino <d.paleino@gmail.com>  Thu, 11 Dec 2008 20:15:03 +0100
+ -- David Paleino <d.paleino@gmail.com>  Sun, 14 Dec 2008 14:05:12 +0100
 
 bash-completion (20080705) unstable; urgency=low