[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone4-132-gc81d191

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit c81d1910d7d0a4162b865e250d2b3a7d6620f4d1
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 11 18:49:26 2008 +0100

    Added 06_persist-in-var-lib: Put persistent data in /var/lib/freesmartphone

diff --git a/debian/changelog b/debian/changelog
index e489734..b3b7f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ fso-frameworkd (0.milestone4-1) UNRELEASED; urgency=low
     relatively arbitrary 0.2.0. 
   * Removed 06_backport-fix-for-fso-140.patch (was from upstream)
   * Removed 03_print-ntype-error-in-const.py.patch (solved upstream)
+  * Added 06_persist-in-var-lib: Put persistent data in
+    /var/lib/freesmartphone
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 11 Nov 2008 16:59:56 +0100
 
diff --git a/debian/patches/06_persist-in-var-lib.patch b/debian/patches/06_persist-in-var-lib.patch
new file mode 100644
index 0000000..b3aacb5
--- /dev/null
+++ b/debian/patches/06_persist-in-var-lib.patch
@@ -0,0 +1,25 @@
+As a proper FSO distro, we want persistent data in /var/lib/
+--- frameworkd.orig/framework/persist.py
++++ frameworkd/framework/persist.py
+@@ -21,8 +21,8 @@
+ import logging
+ logger = logging.getLogger( "frameworkd.persist" )
+ 
+-from framework.config import config, rootdir
+-rootdir = os.path.join( rootdir, 'persist' )
++from framework.config import config
++rootdir = "/var/lib/freesmartphone"
+ 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" ) ),
+     ]
+ )
diff --git a/debian/patches/series b/debian/patches/series
index d41aa31..2ab6e9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_ascii-encode-in-gsm-channel.py.patch
 04_correct-dbus-paths-for-gypsy.patch
 05_fix-installprefix-in-config.py.patch
+06_persist-in-var-lib.patch

-- 
FSO frameworkd Debian packaging