From f2c6091a2e073d6e5a1460b087e90f660f8f4f53 Mon Sep 17 00:00:00 2001 From: Andreas Moog Date: Wed, 8 Jul 2009 23:07:46 +0200 Subject: [PATCH] Don't add second XSBC-Original-Maintainer if Maintainer was set to Motu or Core-Dev. --- debian/changelog | 4 +++- update-maintainer | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 535a604..2754c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low * update-maintainer: - Don't silently fail when Maintainer-Field contains a comment in brackets. (LP: #397144) + - Don't add second XSBC-Original-Maintainer if Maintainer was set + to Motu or Core-Dev. - -- Andreas Moog Wed, 08 Jul 2009 21:23:24 +0200 + -- Andreas Moog Wed, 08 Jul 2009 23:07:05 +0200 ubuntu-dev-tools (0.75) karmic; urgency=low diff --git a/update-maintainer b/update-maintainer index 629dab4..0123c68 100755 --- a/update-maintainer +++ b/update-maintainer @@ -88,7 +88,14 @@ else: # Set original maintainer field in a string. original_maintainer = maintainer_name + " " + maintainer_mail -final_addition = target_maintainer + "\nXSBC-Original-Maintainer: " + original_maintainer + +# If maintainer-field contained the pre-archive-reorganisation entries, don't add a new +# XSBC-Original maintainer field + +if not "lists.ubuntu.com" in original_maintainer: + final_addition = target_maintainer + "\nXSBC-Original-Maintainer: " + original_maintainer +else: + final_addition = target_maintainer print "The original maintainer for this package is: " + original_maintainer print "Resetting as: " + target_maintainer