[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 08a0cd7fb96950a8be203f1dc0aa1bdea5db2543
Merge: 3861be4aef67e40cc5e16b3b2997356a8e455cca 4a19453f4b5c45ee95e0c65a2e749796b7ef1b81
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Mon Nov 17 23:13:27 2008 +0100

    Merge branch 'stabilization/milestone4'
    
    Conflicts:
    
    	framework/subsystems/ogsmd/gsm/const.py

diff --combined framework/subsystems/ogsmd/gsm/const.py
index 1892375,a670de5..cd9e542
--- a/framework/subsystems/ogsmd/gsm/const.py
+++ b/framework/subsystems/ogsmd/gsm/const.py
@@@ -14,7 -14,6 +14,7 @@@ GSM constants, strings, formats, parse 
  """
  
  import re
 +import string
  from ogsmd.helpers import BiDict
  
  import logging
@@@ -76,7 -75,7 +76,7 @@@ def groupDictIfMatch( pattern, string )
  
  #=========================================================================#
  TIMEOUT = { \
-   "SIMAUTH": 10,
+   "SIMAUTH": 15,
    "SIMACCESS": 10,
    "NETWORK": 10,
    "CFUN": 10,
@@@ -724,9 -723,6 +724,9 @@@ CB_PDU_DCS_LANGUAGE = [ "German", "Engl
          "Dutch", "Swedish", "Danish", "Portuguese", "Finnish",
          "Norwegian", "Greek", "Turkish", "Hungarian", "Polish", None]
  
 +#=========================================================================#
 +PDUADDR_DEC_TRANS = string.maketrans("abcde", "*#abc")
 +PDUADDR_ENC_TRANS = string.maketrans("*#abc", "abcde")
  
  #=========================================================================#
  CALL_DIRECTION = { \
@@@ -803,12 -799,6 +803,12 @@@ NETWORK_USSD_MODE = { 
  }
  
  #=========================================================================#
 +NETWORK_CIPHER_STATUS = { \
 +    0: "disabled",
 +    1: "enabled",
 +}
 +
 +#=========================================================================#
  # PDU TP definitions follow here according to the appearance in GSM 03.40
  # chapter 9.2.3
  TP_MTI_INCOMING = { \

-- 
FSO frameworkd Debian packaging