From b8f3016eb302c8ab47a4251f499effe1ab553872 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 24 Nov 2010 17:59:54 +0200 Subject: [PATCH] edit-patch: Detect quilt patch-system in 3.0 (quilt) packages without any patches yet. --- debian/changelog | 7 +++++++ edit-patch | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e0b53ab..4e65ba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.107) UNRELEASED; urgency=low + + * edit-patch: Detect quilt patch-system in 3.0 (quilt) packages without any + patches yet. + + -- Stefano Rivera Wed, 24 Nov 2010 17:58:18 +0200 + ubuntu-dev-tools (0.106) experimental; urgency=low [ Kees Cook ] diff --git a/edit-patch b/edit-patch index 75532ae..c5f659e 100755 --- a/edit-patch +++ b/edit-patch @@ -64,12 +64,13 @@ detect_patchsystem() { elif [ -e debian/patches/00list ]; then PATCHSYSTEM="dpatch" require_installed dpatch-edit-patch "no dpatch-edit-patch found, is 'dpatch' installed?" - elif [ -e debian/patches/series ]; then + elif [ -e debian/patches/series -o \( \ + -e debian/source/format -a "$(cat debian/source/format)" = "3.0 (quilt)" \) ]; then PATCHSYSTEM="quilt" require_installed quilt "no quilt found, is 'quilt' installed?" else - PATCHSYSTEM="none" - PREFIX="debian/applied-patches" + PATCHSYSTEM="none" + PREFIX="debian/applied-patches" fi }