[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.8.4.9-20090130-4-38-gc9955e3

[Luca Capello]

The following commit has been merged in the debian branch:
commit c9955e3828ae7eeec31283c0a3c8a849fc3f813b
Author: Luca Capello <luca at pca.it>
Date:   Sat Jun 6 18:51:31 2009 +0200

    debian/*: new upstream release

diff --git a/debian/changelog b/debian/changelog
index 8a781ec..678f78e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+fso-frameworkd (0.8.5.1-1) UNRELEASED; urgency=low
+
+  * New upstream release: milestone 5.1.
+  * debian/patches/series: update.
+  * debian/patches/01_adjust-etc-path-in-setup.py.patch:
+    + refresh.
+  * debian/patches/04_correct-dbus-paths-for-gypsy.patch:
+    + refresh.
+  * debian/patches/05_fix-installprefix-in-config.py.patch:
+    + refresh.
+  * debian/patches/08_typo-in-shebang-line.patch:
+    - remove, applied upstream.
+
+ --
+
 fso-frameworkd (0.8.4.9-20090130-4) unstable; urgency=low
 
   * Upload to unstable.
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 ca1c8b2..6af73d3 100644
--- a/debian/patches/01_adjust-etc-path-in-setup.py.patch
+++ b/debian/patches/01_adjust-etc-path-in-setup.py.patch
@@ -1,10 +1,8 @@
-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
+--- fso-frameworkd.orig/setup.py
++++ fso-frameworkd/setup.py
 @@ -24,19 +24,19 @@
      packages = packages,
-     scripts = [ "framework/frameworkd", "tools/cli-framework" ],
+     scripts = [ "framework/frameworkd", "tools/cli-framework", "tools/dump-netlink" ],
      data_files = [
 -        ("../../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ),
 -        ("../../etc/freesmartphone/opreferences/schema/",         ["etc/freesmartphone/opreferences/schema/phone.yaml"]),
diff --git a/debian/patches/04_correct-dbus-paths-for-gypsy.patch b/debian/patches/04_correct-dbus-paths-for-gypsy.patch
index 3cc681e..954063d 100644
--- a/debian/patches/04_correct-dbus-paths-for-gypsy.patch
+++ b/debian/patches/04_correct-dbus-paths-for-gypsy.patch
@@ -1,6 +1,6 @@
 --- fso-frameworkd.orig/etc/dbus-1/system.d/frameworkd.conf
 +++ fso-frameworkd/etc/dbus-1/system.d/frameworkd.conf
-@@ -34,9 +34,9 @@
+@@ -46,9 +46,9 @@
      <policy user="root">
          <allow own="org.freesmartphone.ogpsd"/>
          <allow own="org.freedesktop.Gypsy"/>
diff --git a/debian/patches/05_fix-installprefix-in-config.py.patch b/debian/patches/05_fix-installprefix-in-config.py.patch
index 9c31f72..45cad07 100644
--- a/debian/patches/05_fix-installprefix-in-config.py.patch
+++ b/debian/patches/05_fix-installprefix-in-config.py.patch
@@ -1,6 +1,6 @@
---- frameworkd.orig/framework/config.py
-+++ frameworkd/framework/config.py
-@@ -88,15 +88,9 @@
+--- fso-frameworkd.orig/framework/config.py
++++ fso-frameworkd/framework/config.py
+@@ -97,15 +97,9 @@
  rootlogger.addHandler( handler )
  
  #
@@ -14,7 +14,7 @@
 -    if thisdirname.startswith( p ):
 -        installprefix = p
 -        break
-+installprefix = "/usr" 
++installprefix = "/usr"
  
  logging.info( "Installprefix is %s" % installprefix )
  
diff --git a/debian/patches/series b/debian/patches/series
index bc88a11..089755e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 05_fix-installprefix-in-config.py.patch
 06_persist-in-var-lib.patch
 07_dbus-access-via-busnames.patch
-08_typo-in-shebang-line.patch

-- 
FSO frameworkd Debian packaging