From c49d1f2eaf5bb6272c081450f8c916d3c8be4c62 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sun, 18 May 2014 15:56:08 +0200 Subject: [PATCH] Use quilt again. This mostly reverts commit 2aae14d55cd61ba334dea78c16f16a33a77f6a28 ("Drop build-dependencies on patch and quilt as there are no more patches"), but doesn't re-add the build-dependency on patch. Conflicts: debian/changelog debian/control --- debian/changelog | 3 +-- debian/control | 3 ++- debian/rules | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4757d93..01027d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,7 @@ t-prot (3.0-1) UNRELEASED; urgency=low + Drop quilt patch t-prot-20120207 (was cherry-picked from upstream) + Drop applying mutt 1.5.x patches, they're default now + Drop applying slang-2 patches, they're default now - + Drop build-dependencies on patch and quilt as there are no more patches. - + Drop quilt usage from debian/rules + + Drop build-dependency on patch * Drop unused code from debian/rules * Add Brazilian Portuguese debconf templates translation. (Closes: #719936) Thanks Adriano Rafael Gomes! diff --git a/debian/control b/debian/control index 9862bb4..11f9c94 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: mail Priority: optional Maintainer: Gerfried Fuchs Uploaders: Axel Beckert -Build-Depends-Indep: po-debconf +Build-Depends-Indep: po-debconf, + quilt (>= 0.40-1~) Standards-Version: 3.9.5 Homepage: http://www.escape.de/~tolot/mutt/ Vcs-Browser: http://git.deb.at/w/pkg/t-prot.git diff --git a/debian/rules b/debian/rules index 0f8bd08..47faed4 100755 --- a/debian/rules +++ b/debian/rules @@ -17,12 +17,14 @@ clean: $(checkdir) $(checkroot) -rm -rf $(TMP) debian/files debian/stamp-* + $(MAKE) -f /usr/share/quilt/quilt.make unpatch build: build-arch build-indep build-arch: debian/stamp-build build-indep: debian/stamp-build debian/stamp-build: # only thing to do is apply the patches ... + $(MAKE) -f /usr/share/quilt/quilt.make patch touch debian/stamp-build -- 2.39.2