[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.2.0-git20080909-7-247-g80ec1e1

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 2e3bbac2cce1205b3cbcc01cf5e797d57c45da7d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 11 17:30:21 2008 +0100

    Removed -06_backport-fix-for-fso-140.patch

diff --git a/debian/patches/06_backport-fix-for-fso-140.patch b/debian/patches/06_backport-fix-for-fso-140.patch
deleted file mode 100644
index 16f8cde..0000000
--- a/debian/patches/06_backport-fix-for-fso-140.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 3bb126c..d41aa31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_ascii-encode-in-gsm-channel.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