[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.2.0-git20080909-5-3-gd4a322a

[Luca Capello]

The following commit has been merged in the debian branch:
commit d16ac4c341fd6635b1b94814d2d4fcb124034f39
Author: Luca Capello <luca at pca.it>
Date:   Wed Oct 8 16:48:05 2008 +0200

    debian/patches/06_backport-fix-for-fso-140.patch: new file

diff --git a/debian/changelog b/debian/changelog
index 2cefbd1..e0dc922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+fso-frameworkd (0.2.0-git20080909-6) UNRELEASED; urgency=low
+
+  * debian/patches/series: update.
+  * debian/patches/06_backport-fix-for-fso-140.patch:
+    + backport upstream fix for GPRS (ticket #140), thanks to Martin
+      Giraud-Sauveur <mgs-moko at wasabout.net> for having informed me
+      and Timo Juhani Lindfors <timo.lindfors at iki.fi> for the patch.
+
+ --
+
 fso-frameworkd (0.2.0-git20080909-5) pkg-fso; urgency=low
 
   * Restore upstream sources, modifications to upstream files must
diff --git a/debian/patches/06_backport-fix-for-fso-140.patch b/debian/patches/06_backport-fix-for-fso-140.patch
new file mode 100644
index 0000000..16f8cde
--- /dev/null
+++ b/debian/patches/06_backport-fix-for-fso-140.patch
@@ -0,0 +1,25 @@
+From: Michael 'Mickey' Lauer <mickey at vanille-media.de>
+Date: Sun, 28 Sep 2008 14:56:58 +0000 (+0800)
+Subject: ogsmd: fix GPRS connections with given user. Closes FSO #140
+X-Git-Url: http://git.freesmartphone.org/?p=framework.git;a=commitdiff_plain;h=77b887da0d72a9983e6f214d2208fe39ae8f90d7
+
+ogsmd: fix GPRS connections with given user. Closes FSO #140
+Patch by lindi, thanks a lot!
+
+Note by Luca Capello <luca at pca.it>: only the necessary (first) part of
+that commit has been included in Debian
+---
+
+diff --git a/framework/subsystems/ogsmd/modems/abstract/pdp.py b/framework/subsystems/ogsmd/modems/abstract/pdp.py
+index f7036f1..6ea77f6 100644
+--- a/framework/subsystems/ogsmd/modems/abstract/pdp.py
++++ b/framework/subsystems/ogsmd/modems/abstract/pdp.py
+@@ -54,7 +54,7 @@ class Pdp( AbstractMediator ):
+         # merge with user and password settings
+         if user:
+             logger.info( "configuring ppp for user '%s' w/ password '%s'" % ( user, password ) )
+-            self.ppp_options += [ "user", '"%s"' % user ]
++            self.ppp_options += [ "user", user ]
+             self.pds[self.__class__.PPP_PAP_SECRETS_FILENAME] = '%s * "%s" *\n' % ( user or '*', password )
+             self.pds[self.__class__.PPP_CHAP_SECRETS_FILENAME] =  '%s * "%s" *\n'% ( user or '*', password )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d3ad6c0..d9fee0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_print-ntype-error-in-const.py.patch
 04_correct-dbus-paths-for-gypsy.patch
 05_fix-installprefix-in-config.py.patch
+06_backport-fix-for-fso-140.patch

-- 
FSO frameworkd Debian packaging