diff -u twinkle-1.0.1/debian/changelog twinkle-1.0.1/debian/changelog
--- twinkle-1.0.1/debian/changelog
+++ twinkle-1.0.1/debian/changelog
@@ -1,3 +1,11 @@
+twinkle (1:1.0.1-1ubuntu0.1) gutsy-proposed; urgency=low
+
+  * sip-authentication.patch: Apply patch provided by João Pinto (LP: #155314)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <sgevatter@ubuntu.cat>  Thu, 08 Nov 2007 21:41:48 +0100
+
 twinkle (1:1.0.1-1build2) gutsy; urgency=low
 
   * Rebuild for boost 1.34.0 -> 1.34.1 transistion.
diff -u twinkle-1.0.1/debian/control twinkle-1.0.1/debian/control
--- twinkle-1.0.1/debian/control
+++ twinkle-1.0.1/debian/control
@@ -1,7 +1,8 @@
 Source: twinkle
 Section: comm
 Priority: optional
-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Mark Purcell <msp@debian.org>, Santiago Garcia Mantinan <manty@debian.org>
 Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>= 1.4.2), libccrtp-dev (>= 1.5.0), help2man, libqt3-mt-dev (>= 3:3.3.0), qt3-apps-dev, automake1.9, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-dev, libboost-regex-dev, libzrtpcpp-dev
 Standards-Version: 3.6.1
only in patch2:
unchanged:
--- twinkle-1.0.1.orig/debian/patches/sip-authentication.patch
+++ twinkle-1.0.1/debian/patches/sip-authentication.patch
@@ -0,0 +1,29 @@
+diff -Nur twinkle-1.0.1-1ubuntu0.1/src/parser/request.cpp twinkle-1.0.1-1ubuntu0.1.new/src/parser/request.cpp
+--- twinkle-1.0.1-1ubuntu0.1/src/parser/request.cpp	2007-01-07 08:47:34.000000000 +0100
++++ twinkle-1.0.1-1ubuntu0.1.new/src/parser/request.cpp	2007-11-08 21:12:16.000000000 +0100
+@@ -50,6 +50,9 @@
+ 	}
+ 
+ 	// Determine QOP
++	// If both auth and auth-int are supported by the server, then
++	// choose auth to avoid problems with SIP ALGs. A SIP ALG rewrites
++	// the body of a message, thereby breaking auth-int authentication.
+ 	if (!dchlg.qop_options.empty()) {
+ 		const list<string>::const_iterator i = find(
+ 			dchlg.qop_options.begin(), dchlg.qop_options.end(),
+@@ -57,11 +60,11 @@
+ 		const list<string>::const_iterator j = find(
+ 			dchlg.qop_options.begin(), dchlg.qop_options.end(),
+ 			QOP_AUTH);
+-		if (i != dchlg.qop_options.end())
+-			qop = QOP_AUTH_INT;
++		if (j != dchlg.qop_options.end())
++			qop = QOP_AUTH;
+ 		else {
+-			if (j != dchlg.qop_options.end())
+-				qop = QOP_AUTH;
++			if (i != dchlg.qop_options.end())
++				qop = QOP_AUTH_INT;
+ 			else {
+ 				fail_reason = "Non of the qop values are supported.";
+ 				return false;