From eca4d4e7011b807c778c763fc6de6c9adf0d763c Mon Sep 17 00:00:00 2001
From: "Siegfried-Angel Gevatter Pujals (RainCT)" <siggi.gevatter@gmail.com>
Date: Mon, 1 Oct 2007 18:06:45 +0200
Subject: [PATCH] Proposed bug fix for 144244

---
 README           |  6 +++++-
 debian/changelog |  7 +++++++
 requestsync      | 10 +++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/README b/README
index e1301fd..cdfd791 100644
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ mk-sbuild-lv
     ... will create LVM snapshot chroots via schroot and sbuild. It assumes that 
     sbuild has not be installed and configured before.
 
-pbuilder-dist [create|update|build|clean|login|execute]
+pbuilder-dist [withlog] [create|update|build|clean|login|execute]
    ... is a wrapper to use pbuilder with many different distributions / versions.
    It has to be renamed to something like pbuilder-feisty, pbuilder-gutsy, etc.
 
@@ -37,6 +37,10 @@ pull-debian-debdiff <package> <version>
     ... will attempt to find and download a specific version of a Debian package 
     and its immediate parent to generate a debdiff.
 
+requestsync [-n|-s] <source package> <target release> [base version]
+	... will fill a sync for a package from Debian by sending a bug report to
+	Launchpad.
+
 suspicious-source
    ... will output a list of files which are not common source files. This should be
    run in the root of a source tree to find files which might not be the "prefered 
diff --git a/debian/changelog b/debian/changelog
index 127958b..1745ff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-dev-tools (0.16) UNRELEASED; urgency=low
+
+  * requestsync: allow to customize the SMTP server (LP: #144244)
+  * Add a short description for requestsync to the README file.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <siggi.gevatter@gmail.com>  Mon,  1 Oct 2007 18:04:14 +0200
+
 ubuntu-dev-tools (0.15) gutsy; urgency=low
 
   [ Laurent Bigonville ]
diff --git a/requestsync b/requestsync
index 9bf7ea7..a8e75d8 100755
--- a/requestsync
+++ b/requestsync
@@ -173,8 +173,16 @@ Subject: Please sync %s (%s) from Debian unstable (%s)
 print mail
 
 print 'Press enter to file this bug, Control-C to abort'
+
 sys.stdin.readline()
 
-s = smtplib.SMTP('fiordland.ubuntu.com')
+# get server address
+mailserver = os.getenv('DEBSMTP')
+if mailserver:
+	print 'Using custom SMTP server:', mailserver
+else :
+	mailserver = 'fiordland.ubuntu.com'
+
+s = smtplib.SMTP(mailserver)
 s.sendmail(myemailaddr, to, mail)
 s.quit()