Merge lp:~om26er/ubuntu/karmic/papyon/papyon-fix-663670 into lp:ubuntu/karmic/papyon

[Omer Akram]

bug 663670 has been fixed in lucid and maverick this is for karmic. without this fix msn does not work.

[lp:~om26er/ubuntu/karmic/papyon/papyon-fix-663670]

10. By Omer Akram on 2010-11-29

added DEP3 tag to the patch

11. By Omer Akram on 2010-12-03

bumped version to fix upload conflict

[Omer Akram (om26er)]

Chris, can you please re-upload this to karmic-proposed from Martin Pitt:

I'm sorry, the upload couldn't be accepted, you have to bump the version. (In the past there was an 1.1 upload which got removed from -proposed):

FAILED: papyon (The source papyon - 0.4.3-1ubuntu1.1 is already accepted in ubuntu/karmic and you cannot upload the same version within the same distribution. You have to modify the source version and re-upload

Unmerged revisions

11. By Omer Akram on 2010-12-03

bumped version to fix upload conflict

10. By Omer Akram on 2010-11-29

added DEP3 tag to the patch

9. By Omer Akram on 2010-11-29

* debian/patches/lp_663670.patch
  - for connection problems caused by server side changes (LP: #663670)

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-14 19:37:17 +0000
+++ debian/changelog	2010-12-03 15:49:35 +0000
@@ -1,3 +1,10 @@
+papyon (0.4.3-1ubuntu2) karmic-proposed; urgency=low
+
+  * debian/patches/lp_663670.patch
+    - for connection problems caused by server side changes (LP: #663670)
+
+ -- Omer Akram <[e-mail]>  Mon, 29 Nov 2010 23:59:01 +0500
+
 papyon (0.4.3-1ubuntu1) karmic; urgency=low
 
   * Merge from Debian unstable (LP: #451493), reamining Ubuntu changes:

=== added file 'debian/patches/lp_663670.patch'
--- debian/patches/lp_663670.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp_663670.patch	2010-12-03 15:49:35 +0000
@@ -0,0 +1,18 @@
+From: Louis-Francis Ratté-Boulianne <[e-mail]>
+Subject: Fix Contacts security token policy 
+Origin: http://cgit.freedesktop.org/papyon/commit/?id=4cbfc0abbae78fb16e3b949c775d2e35c0504dd1
+Bug: https://bugs.freedesktop.org/31004
+Bug Ubuntu: https://bugs.launchpad.net/663670
+
+diff -ruN a//papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py b//papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
+--- a//papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py	2009-10-09 07:12:41.000000000 +0600
++++ b//papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py	2010-11-29 23:55:54.750373741 +0500
+@@ -21,7 +21,7 @@
+ import xml.sax.saxutils as xml
+ 
+ class LiveService(object):
+-    CONTACTS = ("contacts.msn.com", "?fs=1&id=24000&kv=7&rn=93S9SWWw&tw=0&ver=2.1.6000.1")
++    CONTACTS = ("contacts.msn.com", "MBI")
+     MESSENGER = ("messenger.msn.com", "?id=507")
+     MESSENGER_CLEAR = ("messengerclear.live.com", "MBI_KEY_OLD")
+     MESSENGER_SECURE = ("messengersecure.live.com", "MBI_SSL")

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-10-14 19:37:17 +0000
+++ debian/patches/series	2010-12-03 15:49:35 +0000
@@ -1,1 +1,2 @@
+lp_663670.patch
 01_add_pycrypto_dep.diff