diff -Nru bash-completion-1.2/debian/changelog bash-completion-1.2/debian/changelog
--- bash-completion-1.2/debian/changelog	2010-08-07 00:44:39.000000000 +0200
+++ bash-completion-1.2/debian/changelog	2011-02-02 16:41:55.000000000 +0100
@@ -1,3 +1,12 @@
+bash-completion (1:1.2-2ubuntu1.1) maverick-proposed; urgency=low
+
+  * debian/patches/fix_typo_in_openssl_completion:
+    - Fix typo in openssl completion (LP: #690644)
+  * debian/patches/fix_p4_completion.patch:
+    - Fix p4 completion (LP: #652104)
+
+ -- Angel Abad <angelabad@ubuntu.com>  Mon, 10 Jan 2011 18:07:59 +0100
+
 bash-completion (1:1.2-2ubuntu1) maverick; urgency=low
 
   * Merge from Debian (LP: #612862). Remaining changes:
diff -Nru bash-completion-1.2/debian/patches/fix_p4_completion.patch bash-completion-1.2/debian/patches/fix_p4_completion.patch
--- bash-completion-1.2/debian/patches/fix_p4_completion.patch	1970-01-01 01:00:00.000000000 +0100
+++ bash-completion-1.2/debian/patches/fix_p4_completion.patch	2011-02-02 16:41:18.000000000 +0100
@@ -0,0 +1,46 @@
+Description: Fix p4 completion
+Author: Ville Skytt <ville.skytta@iki.fi>
+From: Angel Abad <angelabad@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/652104
+Origin: upstream, http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=5eead0ebeecf7d3212df3fea9cfe0fa88b6d0274
+
+--- bash-completion-1.2.orig/contrib/p4
++++ bash-completion-1.2/contrib/p4
+@@ -3,10 +3,10 @@
+ have p4 &&
+ _p4()
+ {
+-    local cur prev preprev p4commands p4filetypes
++    local cur prev words cword p4commands p4filetypes
+ 
+     COMPREPLY=()
+-    _get_comp_words_by_ref cur prev preprev
++    _get_comp_words_by_ref cur prev words cword
+ 
+     # rename isn't really a command
+     p4commands="$( p4 help commands | awk 'NF>3 {print $1}' )"
+@@ -14,9 +14,9 @@ _p4()
+         uresource uxbinary xbinary xltext xtempobj xtext \
+         text binary resource"
+ 
+-    if [ $COMP_CWORD -eq 1 ]; then
++    if [ $cword -eq 1 ]; then
+         COMPREPLY=( $( compgen -W "$p4commands" -- "$cur" ) )
+-    elif [ $COMP_CWORD -eq 2 ]; then
++    elif [ $cword -eq 2 ]; then
+         case $prev in
+             help)
+                 COMPREPLY=( $( compgen -W "simple commands \
+@@ -29,10 +29,10 @@ _p4()
+             *)
+                 ;;
+         esac
+-    elif [ $COMP_CWORD -gt 2 ]; then
++    elif [ $cword -gt 2 ]; then
+         case $prev in
+             -t)
+-                case $preprev in
++                case ${words[$cword-2]} in
+                     add|edit|reopen)
+                         COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
+                         ;;
diff -Nru bash-completion-1.2/debian/patches/fix_typo_in_openssl_completion.patch bash-completion-1.2/debian/patches/fix_typo_in_openssl_completion.patch
--- bash-completion-1.2/debian/patches/fix_typo_in_openssl_completion.patch	1970-01-01 01:00:00.000000000 +0100
+++ bash-completion-1.2/debian/patches/fix_typo_in_openssl_completion.patch	2011-02-02 16:42:36.000000000 +0100
@@ -0,0 +1,18 @@
+Description: Fix typo in openssl x509 -subject_hash completion
+Author: Marian Sigler 
+From: Angel Abad <angelabad@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/690644
+Bug-Debian: http://bugs.debian.org/609552
+Origin: upstream, http://git.debian.org/?p=bash-completion/bash-completion.git;a=commit;h=5f04a30f7ab561dc99054445a7f635f3df3a0747
+
+--- a/contrib/openssl
++++ b/contrib/openssl
+@@ -217,7 +217,7 @@
+                     ;;
+                 x509)
+                     options='-inform -outform -keyform -CAform -CAkeyform -in \
+-                        -out -serial -hash -subject-hash -issuer_hash -subject \
++                        -out -serial -hash -subject_hash -issuer_hash -subject \
+                         -issuer -nameopt -email -startdate -enddate -purpose \
+                         -dates -modulus -fingerprint -alias -noout -trustout \
+                         -clrtrust -clrreject -addtrust -addreject -setalias \
diff -Nru bash-completion-1.2/debian/patches/series bash-completion-1.2/debian/patches/series
--- bash-completion-1.2/debian/patches/series	2010-08-07 00:44:39.000000000 +0200
+++ bash-completion-1.2/debian/patches/series	2011-02-02 16:40:24.000000000 +0100
@@ -1,2 +1,4 @@
 00-fix_586210.patch
 disable-avahi-browse.diff
+fix_typo_in_openssl_completion.patch
+fix_p4_completion.patch