[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, gismo-debian-quilt, updated. debian/0.2.0-git20080909-4-10-g393773d

[Luca Capello]

The following commit has been merged in the gismo-debian-quilt branch:
commit 393773d6ea2fbb4855c29ba2b998cc0626dcf2bd
Author: Luca Capello <luca at pca.it>
Date:   Sun Oct 5 21:56:59 2008 +0200

    debian/patches/05_fix-installprefix-in-config.py.patch: new file
    
    This patch is based on b266f09b346b2b10115db1f4298fa58132cfc526.

diff --git a/debian/changelog b/debian/changelog
index ca1b93e..b0b2a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ fso-frameworkd (0.2.0-git20080909-5) UNRELEASED; urgency=low
   * debian/patches/02_ascii-encode-in-gsm-channel.py.patch: new file.
   * debian/patches/03_print-ntype-error-in-const.py.patch: new file.
   * debian/patches/04_correct-dbus-paths-for-gypsy.patch: new file.
+  * debian/patches/05_fix-installprefix-in-config.py.patch: new file.
   * debian/frameworkd.conf: new file.
   * debian/fso-frameworkd.install:
     + install debian/frameworkd.conf in /etc.
diff --git a/debian/patches/05_fix-installprefix-in-config.py.patch b/debian/patches/05_fix-installprefix-in-config.py.patch
new file mode 100644
index 0000000..3c8d455
--- /dev/null
+++ b/debian/patches/05_fix-installprefix-in-config.py.patch
@@ -0,0 +1,20 @@
+--- fso-frameworkd.orig/framework/config.py
++++ fso-frameworkd/framework/config.py
+@@ -62,15 +62,9 @@
+ logging.basicConfig( level=loggingmap.get( debug, logging.INFO ), format="%(name)-8s %(levelname)-8s %(message)s" )
+ 
+ #
+-# compute install prefix
++# fixed installprefix for Debian (auto sensing does not work, due to python-support)
+ #
+-installprefix = "/" # unknown first
+-searchpath = "/usr/local /usr /local/pkg/fso /opt".split()
+-thisdirname = os.path.dirname( __file__ )
+-for p in searchpath:
+-    if thisdirname.startswith( p ):
+-        installprefix = p
+-        break
++installprefix = "/usr" 
+ 
+ logger.info( "Installprefix is %s" % installprefix )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1a256c6..d3ad6c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_ascii-encode-in-gsm-channel.py.patch
 03_print-ntype-error-in-const.py.patch
 04_correct-dbus-paths-for-gypsy.patch
+05_fix-installprefix-in-config.py.patch

-- 
FSO frameworkd Debian packaging