From patchwork Wed Jul 11 16:43:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 170490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 834212C0204 for ; Thu, 12 Jul 2012 02:44:14 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sp01D-0005EQ-Fz; Wed, 11 Jul 2012 16:44:03 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sp01B-0005ED-Bk for kernel-team@lists.ubuntu.com; Wed, 11 Jul 2012 16:44:01 +0000 Received: from bl21-64-66.dsl.telepac.pt ([2.82.64.66] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Sp01A-0002YP-TR for kernel-team@lists.ubuntu.com; Wed, 11 Jul 2012 16:44:01 +0000 From: Luis Henriques To: kernel-team@lists.ubuntu.com Subject: [Hardy linux-ubuntu-modules-2.6.24][PATCH 1/1] UBUNTU: SAUCE: Fix full name and address in changelog Date: Wed, 11 Jul 2012 17:43:59 +0100 Message-Id: <1342025039-15265-1-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch normalises the way full name and email address are obtained in debian/rules for new changelog entries in target startnewrelease. Signed-off-by: Luis Henriques --- debian/rules.d/1-maintainer.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index b3795dc..3724ca2 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -8,8 +8,6 @@ insertchanges: startnewrelease: dh_testdir @nextminor=$(shell expr `echo $(revision) | awk -F. '{print $$2}'` + 1); \ - user=$(shell whoami); \ - memyselfandirene="$$(getent passwd $$user | cut -d ":" -f 5 | cut -d "," -f 1)"; \ now="$(shell date -R)"; \ echo "Creating new changelog set for $(release)-$(abinum).$$nextminor..."; \ echo -e "linux-ubuntu-modules-$(release) ($(release)-$(abinum).$$nextminor) UNRELEASED; urgency=low\n" > debian/changelog.new; \ @@ -19,8 +17,7 @@ startnewrelease: >> debian/changelog.new; \ echo " CHANGELOG: Use the insertchanges target to create the final log." \ >> debian/changelog.new; \ - echo -e "\n -- $$memyselfandirene <$$user@ubuntu.com> $$now\n" >> \ - debian/changelog.new ; \ + echo -e "\n -- $$DEBFULLNAME <$$DEBEMAIL> $$now\n" >>debian/changelog.new; \ cat debian/changelog >> debian/changelog.new; \ mv debian/changelog.new debian/changelog