From f74114a1cde90744719359fd5fd8751486d0626618bc2565595bf7da31574715 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.com>
Date: Tue, 2 Nov 2010 17:49:19 +0000
Subject: [PATCH] - Fix bash completion after the removal of the "remove"
 command and   the addition of the "revert" command (bnc#330753).

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=28
---
 completion-revert.patch | 26 ++++++++++++++++++++++++++
 quilt.changes           |  6 ++++++
 quilt.spec              |  3 ++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 completion-revert.patch

diff --git a/completion-revert.patch b/completion-revert.patch
new file mode 100644
index 0000000..f206aec
--- /dev/null
+++ b/completion-revert.patch
@@ -0,0 +1,26 @@
+The version of quilt we have currently doesn't have a "remove" command but
+it has a "revert" command, so the bash completion should handle that.
+---
+ bash_completion |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- quilt-0.48.orig/bash_completion
++++ quilt-0.48/bash_completion
+@@ -97,7 +97,7 @@ _quilt_completion()
+     # quilt sub commands 
+     cmds='add annotate applied delete diff edit files fold fork graph \
+           grep header import mail new next patches pop previous push refresh \
+-	  remove rename series setup snapshot top unapplied'
++	  revert rename series setup snapshot top unapplied'
+ 
+     # if no command were given, complete on commands
+     if [[ $COMP_CWORD -eq 1 ]] ; then
+@@ -253,7 +253,7 @@ _quilt_completion()
+ 		;;
+ 	   esac
+ 	   ;;
+-	remove)
++	revert)
+ 	   case $prev in
+ 	     -P)
+  	        COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
diff --git a/quilt.changes b/quilt.changes
index f726522..7abcc21 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  2 18:47:20 CET 2010 - jdelvare@suse.de
+
+- Fix bash completion after the removal of the "remove" command and
+  the addition of the "revert" command (bnc#330753).
+
 -------------------------------------------------------------------
 Mon Oct 25 15:52:36 CEST 2010 - jdelvare@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index 744905b..442bd5d 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -45,6 +45,7 @@ Patch10:        inspect-lzma-xz.patch
 Patch11:        fix-patch-version-detection.patch
 Patch12:        setup-add-fuzz-parameter.patch
 Patch13:        setup-support-reverse-patch.patch
+Patch14:        completion-revert.patch
 Url:            http://savannah.nongnu.org/projects/quilt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -64,7 +65,7 @@ Authors:
 
 %prep
 %setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P 13
+%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P 13 -P 14
 
 %build
 autoconf