Revisions of quilt
Jean Delvare (jdelvare)
committed
(revision 14)
- lzma-xz-support.patch: Add support for lzma/xz-compressed files (bnc#555273). Patch from Philipp Thomas. - inspect-lzma-xz.patch: Add support for lzma/xz-compressed files to inspect (bnc#555273). - Add dependency on "file", inspect (and thus "quilt setup") needs it.
Takashi Iwai (tiwai)
committed
(revision 12)
Jean Delvare (jdelvare)
committed
(revision 11)
- Fix a French translation that was saying the exact opposite of the original message.
Jean Delvare (jdelvare)
committed
(revision 8)
- Include /etc/bash_completion.d/quilt.sh only once in file list.
Jean Delvare (jdelvare)
committed
(revision 5)
- update to 0.48
o Obsoletes quilt-fix-completion.diff.
o Obsoletes quilt-improve-formail-error.diff.
- fix-test-create-delete.diff: Fix error in create-delete.test in
Factory.
- Don't use Recommends on SLES9, rpm doesn't know about it there.
--This line, and those below, will be ignored--
M docdir.diff
A fix-test-create-delete.diff
! quilt-0.47.tar.bz2
D quilt-fix-completion.diff
D quilt-improve-formail-error.diff
M quilt.changes
M quilt.spec
Diff for working copy: .
Index: docdir.diff
===================================================================
--- docdir.diff (revision 4)
+++ docdir.diff (working copy)
@@ -3,9 +3,9 @@
doc/quilt.1.in | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -258,7 +258,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
+--- quilt-0.48.orig/Makefile.in
++++ quilt-0.48/Makefile.in
+@@ -266,7 +266,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
-e 's:@VERSION''@:$(VERSION):g' \
-e 's:@RELEASE''@:$(RELEASE):g' \
-e 's:@LOCALEDIR''@:$(localedir):g' \
@@ -14,7 +14,7 @@
$< > $@
@$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
-@@ -317,11 +317,11 @@ endif
+@@ -325,11 +325,11 @@ endif
$(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
$(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
@@ -29,7 +29,7 @@
$(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
$(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
-@@ -359,7 +359,7 @@ uninstall ::
+@@ -367,7 +367,7 @@ uninstall ::
$(notdir $(MAN1))) \
$(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \
$(BUILD_ROOT)$(etcdir)/quilt.quiltrc \
@@ -38,9 +38,9 @@
$(BUILD_ROOT)$(emacsdir)/quilt.el
check: $(TESTS:test/%.test=test/.%.ok)
---- a/doc/quilt.1.in
-+++ b/doc/quilt.1.in
-@@ -212,7 +212,7 @@ the pdf documentation, and in the help m
+--- quilt-0.48.orig/doc/quilt.1.in
++++ quilt-0.48/doc/quilt.1.in
+@@ -217,7 +217,7 @@ the pdf documentation, and in the help m
.SH SEE ALSO
Index: quilt.changes
===================================================================
--- quilt.changes (revision 4)
+++ quilt.changes (working copy)
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jun 9 18:59:16 CEST 2009 - jdelvare@suse.de
+
+- update to 0.48
+ o Obsoletes quilt-fix-completion.diff.
+ o Obsoletes quilt-improve-formail-error.diff.
+- fix-test-create-delete.diff: Fix error in create-delete.test in
+ Factory.
+- Don't use Recommends on SLES9, rpm doesn't know about it there.
+
-------------------------------------------------------------------
Mon Nov 10 13:04:10 CET 2008 - bwalle@suse.de
Index: quilt.spec
===================================================================
--- quilt.spec (revision 4)
+++ quilt.spec (working copy)
@@ -1,5 +1,5 @@
#
-# spec file for package quilt (Version 0.47)
+# spec file for package quilt (Version 0.48)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,18 +23,19 @@
Summary: A Tool for Working with Many Patches
License: GPL v2 or later
Group: Productivity/Text/Utilities
-Version: 0.47
+Version: 0.48
Release: 1
Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat
+%if %sles_version >= 1000
Recommends: procmail
+%endif
AutoReqProv: off
Source: %{name}-%{version}.tar.bz2
Source1: suse-start-quilt-mode.el
Patch1: expand.diff
Patch2: docdir.diff
Patch3: patch-wrapper-rpm.diff
-Patch4: %{name}-fix-completion.diff
-Patch5: %{name}-improve-formail-error.diff
+Patch4: fix-test-create-delete.diff
Url: http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -54,7 +55,7 @@
%prep
%setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5
+%patch -p1 -P 1 -P 2 -P 3 -P 4
%build
autoconf
Index: fix-test-create-delete.diff
===================================================================
--- fix-test-create-delete.diff (revision 4)
+++ fix-test-create-delete.diff (working copy)
@@ -1,0 +1,11 @@
+--- quilt-0.48.orig/test/create-delete.test
++++ quilt-0.48/test/create-delete.test
+@@ -34,7 +34,7 @@ file creates and deletions.
+ > which already exists! Assume -R? [n]
+ > Apply anyway? [n]
+ > Skipping patch.
+- >~ 1 out of 1 hunk ignored -- saving rejects to (file )?create.rej
++ >~ 1 out of 1 hunk ignored( -- saving rejects to (file )?create.rej)?
+ >~ The next patch would delete the file `?delete'?,
+ > which does not exist! Assume -R? [n]
+ > Apply anyway? [n]
Index: quilt-fix-completion.diff
===================================================================
--- quilt-fix-completion.diff (revision 4)
+++ quilt-fix-completion.diff (working copy)
@@ -1,21 +1,0 @@
-From: Bernhard Walle <bwalle@suse.de>
-Subject: [PATCH] Fix bash completion for 'quilt fold <TAB>'
-References: 415762
-
-
-Signed-off-by: Bernhard Walle <bwalle@suse.de>
-
----
- bash_completion | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/bash_completion
-+++ b/bash_completion
-@@ -184,6 +184,7 @@ _quilt_completion()
- COMPREPLY=( $( compgen -W "0 1" -- $cur ) )
- ;;
- *)
-+ _quilt_comfile
- COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p" -- $cur ) )
- ;;
- esac
Index: quilt-improve-formail-error.diff
===================================================================
--- quilt-improve-formail-error.diff (revision 4)
+++ quilt-improve-formail-error.diff (working copy)
@@ -1,31 +1,0 @@
-From: Bernhard Walle <bwalle@suse.de>
-Subject: [PATCH] Check for 'formail' in 'quilt mail'
-
-To allow using 'procmail' (which contains 'formail') as weak dependency in
-package managers, explicitely check for the 'formail' binary when invoking
-'quilt mail' so that the user gets a clear error message when 'formail'
-is missing and knows what to do.
-
-
-Signed-off-by: Bernhard Walle <bwalle@suse.de>
-
----
- quilt/mail.in | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/quilt/mail.in
-+++ b/quilt/mail.in
-@@ -232,6 +232,13 @@ then
- usage
- fi
-
-+# check if formail is installed before doing anything
-+if ! type formail &> /dev/null
-+then
-+ echo "You have to install 'formail' to use 'quilt mail'" >&2
-+ exit 1
-+fi
-+
- if [ $# -ge 1 ]
- then
- if [ "$1" = - ]
Bernhard Walle (bwalle)
committed
(revision 3)
- Use 'type' instead of 'which' in last change to avoid dependency of 'which' package.
Bernhard Walle (bwalle)
committed
(revision 2)
- Only recommend 'procmail' (contains the 'formail' binary) instead of requiring it. It's only needed for the 'mail' command.
Displaying revisions 121 - 135 of 135
