From 7746e67d74dfca5d7f8242956d089fe8902fd217 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 13 Sep 2010 22:23:09 +0200 Subject: [PATCH] update-maintainer: Correctly update the Maintainer field to the new Ubuntu Developers address (instead of the calling user) when the package is not in Debian. --- debian/changelog | 5 +++++ update-maintainer | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ee221d0..06fc7bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,11 @@ ubuntu-dev-tools (0.102) UNRELEASED; urgency=low * sponsor-patch: New script to download a patch from a Launchpad bug, patch the source package, build, check and uploads it (to Ubuntu or a PPA). + [ Stefano Rivera ] + * update-maintainer: Correctly update the Maintainer field to the new Ubuntu + Developers address (instead of the calling user) when the package is not + in Debian. + -- Benjamin Drung Sun, 15 Aug 2010 02:22:08 +0200 ubuntu-dev-tools (0.101) unstable; urgency=low diff --git a/update-maintainer b/update-maintainer index 37b6789..cfe63df 100755 --- a/update-maintainer +++ b/update-maintainer @@ -98,7 +98,9 @@ if 'Ubuntu Developers' in maintainer_name and \ print "Ubuntu Developers is already set as maintainer." sys.exit(0) -if not (ubuntutools.packages.checkIsInDebian(package_name, 'unstable') or ubuntutools.packages.checkIsInDebian(package_name, 'experimental')): +if not old_maintainer and not ( + ubuntutools.packages.checkIsInDebian(package_name, 'unstable') + or ubuntutools.packages.checkIsInDebian(package_name, 'experimental')): user_email_address = os.getenv('DEBEMAIL') if not user_email_address: user_email_address = os.getenv('EMAIL')