From 2e64af4a346d9660529d875aa58ce427b2ade4e9 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 18 Jul 2008 12:32:58 +0100 Subject: [PATCH] update-maintainer: Stop mentioning "Modify Maintainer: value blabla" since it is a required global policy anyway and totally pointless changelog noise. --- debian/changelog | 8 ++++++++ update-maintainer | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d247d7..692ebeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ubuntu-dev-tools (0.33) UNRELEASED; urgency=low + + * update-maintainer: Stop mentioning "Modify Maintainer: value blabla" since + it is a required global policy anyway and totally pointless changelog + noise. + + -- Martin Pitt Fri, 18 Jul 2008 12:29:57 +0100 + ubuntu-dev-tools (0.32) intrepid; urgency=low [ Iain Lane ] diff --git a/update-maintainer b/update-maintainer index 808ee7b..9d3cdda 100755 --- a/update-maintainer +++ b/update-maintainer @@ -11,7 +11,6 @@ Usage: $0 [--path=PATH] [--section=SECTION] [--nochangelog] --path=PATH Specify the path of the source directory. --section=SECTION Specify the section of the package (if the package is not yet in the archive. ---nochangelog Do not add to the changelog, only alter debian/control. EOF } @@ -29,9 +28,6 @@ for argv in "$@"; do [ "$value" != "multiverse" ] && echo "Invalid section. Valid sections: main restricted universe multiverse" >&2 && exit 1 section=$value ;; - "--nochangelog"|"--no-changelog") - nochangelog=1 - ;; "--help") usage exit 0 @@ -87,6 +83,3 @@ esac for file in control{,.in,.real}; do [ -f $DEBIANDIR/$file ] && sed -ri "s/(^Maintainer:) (.*)/\1 $email\nXSBC-Original-\1 \2/" $DEBIANDIR/$file done - -[ -z "$nochangelog" ] && dch --changelog $DEBIANDIR/changelog "Modify Maintainer value to match the DebianMaintainerField specification." -echo "Maintainer changed to $email."