From patchwork Wed Jul 11 16:43:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Hardy, linux-ubuntu-modules-2.6.24, 1/1] UBUNTU: SAUCE: Fix full name and address in changelog Date: Wed, 11 Jul 2012 06:43:59 -0000 From: Luis Henriques X-Patchwork-Id: 170490 Message-Id: <1342025039-15265-1-git-send-email-luis.henriques@canonical.com> To: kernel-team@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