[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone5-180-g5848db1

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit ca0134cf75c1260610a164090a5ee0d26562f542
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 20:11:39 2009 +0100

    setup.py adjusting moved from 06_persist-in-var-lib.patch to 01_adjust-etc-path-in-setup.py.patch

diff --git a/debian/patches/06_persist-in-var-lib.patch b/debian/patches/06_persist-in-var-lib.patch
index b3aacb5..9bffe51 100644
--- a/debian/patches/06_persist-in-var-lib.patch
+++ b/debian/patches/06_persist-in-var-lib.patch
@@ -1,9 +1,11 @@
 As a proper FSO distro, we want persistent data in /var/lib/
---- frameworkd.orig/framework/persist.py
-+++ frameworkd/framework/persist.py
+Index: frameworkd/framework/persist.py
+===================================================================
+--- frameworkd.orig/framework/persist.py	2009-02-02 20:10:50.000000000 +0100
++++ frameworkd/framework/persist.py	2009-02-02 22:17:32.000000000 +0100
 @@ -21,8 +21,8 @@
  import logging
- logger = logging.getLogger( "frameworkd.persist" )
+ logger = logging.getLogger( MODULE_NAME )
  
 -from framework.config import config, rootdir
 -rootdir = os.path.join( rootdir, 'persist' )
@@ -12,14 +14,3 @@ As a proper FSO distro, we want persistent data in /var/lib/
  format = config.getValue( "frameworkd", "persist_format", "pickle" )
  
  if format == "pickle":
---- frameworkd.orig/setup.py
-+++ frameworkd/setup.py
-@@ -33,7 +33,7 @@
-         ("/etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/default.yaml"]),
-         ("/etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/silent.yaml"]),
-         ("/etc/freesmartphone/oevents", ["etc/freesmartphone/oevents/rules.yaml"]),
--        ("/etc/freesmartphone/persist", ["etc/freesmartphone/persist/README"]),
-+        ("/var/lib/freesmartphone", ["etc/freesmartphone/persist/README"]),
-         ("/usr/share/doc/fso-frameworkd/examples/", getDir( "examples" ) ),
-     ]
- )

-- 
FSO frameworkd Debian packaging