[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 5ac129c4be012bc61275ed01a417ab85a8a42ed1
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 20:07:39 2009 +0100

    Updated 01_adjust-etc-path-in-setup.py.patch

diff --git a/debian/patches/01_adjust-etc-path-in-setup.py.patch b/debian/patches/01_adjust-etc-path-in-setup.py.patch
index 34f4b2a..ca1c8b2 100644
--- a/debian/patches/01_adjust-etc-path-in-setup.py.patch
+++ b/debian/patches/01_adjust-etc-path-in-setup.py.patch
@@ -1,32 +1,38 @@
---- frameworkd.orig/setup.py
-+++ frameworkd/setup.py
-@@ -23,17 +23,17 @@
+Index: frameworkd/setup.py
+===================================================================
+--- frameworkd.orig/setup.py	2009-02-02 19:58:47.000000000 +0100
++++ frameworkd/setup.py	2009-02-02 20:07:15.000000000 +0100
+@@ -24,19 +24,19 @@
      packages = packages,
      scripts = [ "framework/frameworkd", "tools/cli-framework" ],
      data_files = [
 -        ("../../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ),
--        ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
--        ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]),
--        ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/rules.yaml"]),
--        ("../../etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
--        ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
--        ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
--        ("../../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"]),
+-        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/profiles.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/rules.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/conf/profiles/",  ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
+-        ("../../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"]),
+-        ("../../etc/freesmartphone/ogsmd",                        ["etc/freesmartphone/ogsmd/networks.tab"]),
+-        ("../../etc/freesmartphone/opim",                         ["etc/freesmartphone/opim/csv-contacts.txt"]),
 -        ("freesmartphone/examples/", getDir( "examples" ) ),
 +        ("/etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ),
-+        ("/etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
-+        ("/etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]),
-+        ("/etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/rules.yaml"]),
-+        ("/etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
-+        ("/etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
-+        ("/etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
-+        ("/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"]),
++        ("/etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
++        ("/etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/profiles.yaml"]),
++        ("/etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/rules.yaml"]),
++        ("/etc/freesmartphone/opreferences/conf/profiles/",  ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
++        ("/etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
++        ("/etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
++        ("/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"]),
++        ("/var/lib/freesmartphone",                          ["etc/freesmartphone/persist/README"]),
++        ("/etc/freesmartphone/ogsmd",                        ["etc/freesmartphone/ogsmd/networks.tab"]),
++        ("/etc/freesmartphone/opim",                         ["etc/freesmartphone/opim/csv-contacts.txt"]),
 +        ("/usr/share/doc/fso-frameworkd/examples/", getDir( "examples" ) ),
      ]
  )

-- 
FSO frameworkd Debian packaging