[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

Rico Rommel rico at bierrommel.de
Sat Aug 6 08:20:24 UTC 2011 

The following commit has been merged in the debian branch:
commit d683a71484655f0fc97b25de9d43ceb01ea0c4db
Author: Rico Rommel <rico at bierrommel.de>
Date:   Fri Aug 5 23:34:42 2011 +0200

    update debian/*

diff --git a/debian/changelog b/debian/changelog
index a842625..780e591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,62 @@
-fso-frameworkd (0.8.5.1-2) UNRELEASED; urgency=low
+fso-frameworkd (0.9.5.9+git20110512-1) unstable; urgency=low
 
+  * new upstrem release
+  * fixed lintian warnings
+  * new package fso-frameworkd-gta01
+  * newmessage-trigger from shr
+  * bump standards to 3.9.2
+  * add Rico Rommel <rico at bierrommel.de> to uploaders
+
+ -- Rico Rommel <rico at bierrommel.de>  Sat, 25 Jun 2011 08:33:52 +0200
+
+fso-frameworkd (0.9.5.9+git20100131-4) pkg-fso; urgency=low
+
+  * Fix the last patch 
+  * Debian Standards Version 3.8.3 -> 3.8.4
+  * DM-Upload-Allowed: yes
+
+ -- Sebastian Reichel <elektranox at gmail.com>  Tue, 23 Feb 2010 11:06:30 +0100
+
+fso-frameworkd (0.9.5.9+git20100131-3) pkg-fso; urgency=low
+
+  * add patch to fix race condition of ogsmd (thanks to
+    Jose Luis Perez Diez)
+
+ -- Sebastian Reichel <elektranox at gmail.com>  Sun, 21 Feb 2010 23:46:33 +0100
+
+fso-frameworkd (0.9.5.9+git20100131-2) pkg-fso; urgency=low
+
+  * add patch to fix opimd crashing on messages containing
+    unicode (thanks arne anka)
+
+ -- Sebastian Reichel <elektranox at gmail.com>  Sun, 21 Feb 2010 23:46:32 +0100
+
+fso-frameworkd (0.9.5.9+git20100131-1) pkg-fso; urgency=low
+
+  * New upstream version
+   + opim remove "tel:"-prefix script has been added
+
+ -- Sebastian Reichel <elektranox at gmail.com>  Sun, 31 Jan 2010 12:00:54 +0100
+
+fso-frameworkd (0.9.5.9+git20100126-1) pkg-fso; urgency=low
+
+  * New upstream version
+   + opim 
+
+ -- Sebastian Reichel <elektranox at gmail.com>  Wed, 26 Jan 2010 16:05:00 +0100
+
+fso-frameworkd (0.9.5.9+git20090920-1) pkg-fso; urgency=low
+
+  * New upstream release:
+    + milestone5.5
+    + first release using fso-usaged
   * debian/patches/08_typo-in-shebang-line.patch:
-    - really remove it.
+    - really removed now
+  * Debian Standards Version 3.8.1 -> 3.8.3
+  * Added myself to Uploaders
+  * Provide fso-frameworkd in LSB header of init.d script
 
- --
+ -- Sebastian Reichel <elektranox at gmail.com>  Sun, 20 Sep 2009 21:13:00 +0200
 
 fso-frameworkd (0.8.5.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3b7c888..5cd9513 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,35 @@ Source: fso-frameworkd
 Section: misc
 Priority: extra
 Maintainer: Debian freesmartphone.org Team <pkg-fso-maint at lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata at debian.org>, Luca Capello <luca at pca.it>
-Build-Depends: debhelper (>= 7), cython, python-support (>= 0.6), python-dev (>= 2.5), quilt (>= 0.40)
-Standards-Version: 3.8.1
+Uploaders: Joachim Breitner <nomeata at debian.org>, Luca Capello <luca at pca.it>, Sebastian Reichel <elektranox at gmail.com>, Rico Rommel <rico at bierrommel.de>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7),
+               cdbs (>= 0.4.65),
+               cython,
+               python-support (>= 0.6),
+               python-all (>= 2.5),
+               quilt
+Standards-Version: 3.9.2
 Homepage: http://freesmartphone.org/
 Vcs-Git: git://git.debian.org/git/pkg-fso/fso-frameworkd.git
 Vcs-Browser: http://git.debian.org/?p=pkg-fso/fso-frameworkd.git;a=summary
 
 Package: fso-frameworkd
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-serial, python-yaml, python-gst0.10, gstreamer0.10-alsa, python-dbus, fso-gsm0710muxd | fso-abyss, dbus, alsa-utils, ppp
-Recommends: fso-config, fso-sounds
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         python-serial,
+         python-yaml,
+         python-dbus,
+         dbus,
+         python-phoneutils
+Recommends: fso-sounds, fso-usaged, python-rtc
 Conflicts: frameworkd, python2.5 (<< 2.5.2-13), fso-frameworkd-wireless-glue, openmoko-panel-plugin (<= 0.8-1), zhone (<< 0-git20090202)
-Replaces: frameworkd, fso-frameworkd (<< 0.2.0-git20080909-7), fso-frameworkd-wireless-glue
+Replaces: frameworkd, fso-frameworkd-wireless-glue
 Provides: frameworkd
 Description: freesmartphone.org Framework Daemon
- This packages provides the backend daemon of the freesmartphone.org software
+ This package provides the backend daemon of the freesmartphone.org software
  stack. It provides all telephone related features, such as accepting and making
  calls, receiving and sending SMS and other hardware specifics via a D-Bus
  interface to the user interface programs.
@@ -25,28 +38,29 @@ Description: freesmartphone.org Framework Daemon
  This package is part of the freesmartphone.org software stack
  and it is targeted for smartphones.
 
-Package: fso-config-general
+Package: fso-frameworkd-gta02
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.2.0-git20080909-7), fso-sounds-yue-base | fso-sounds
-Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
-Replaces: fso-config
-Provides: fso-config
-Description: general configuration files for the freesmartphone.org frameworkd
- This packages provides the freesmartphone.org frameworkd configuration
- files.  It also depends on the default fso-sounds package.
+Depends: ${misc:Depends}, fso-usaged-openmoko, fso-deviced-openmoko, fso-gsmd-openmoko, fso-frameworkd
+Conflicts: fso-config-gta02
+Description: configuration files for freesmartphone.org Framework Daemon for GTA02
+ This package provides the backend daemon of the freesmartphone.org software
+ stack. It provides all telephone related features, such as accepting and making
+ calls, receiving and sending SMS and other hardware specifics via a D-Bus
+ interface to the user interface programs.
  .
  This package is part of the freesmartphone.org software stack
  and it is targeted for smartphones.
 
-Package: fso-sounds-none
+Package: fso-frameworkd-gta01
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: fso-frameworkd
-Conflicts: fso-frameworkd (<< 0.2.0-git20080909-7)
-Provides: fso-sounds
-Description: void ringtones for the freesmartphone.org frameworkd
- This packages configures the freesmartphone.org frameworkd for no
- ringtones.
+Depends: ${misc:Depends}, fso-usaged-openmoko, fso-deviced-openmoko, fso-gsmd-openmoko, fso-frameworkd
+Conflicts: fso-config-gta01
+Description: configuration files for freesmartphone.org Framework Daemon for GTA01
+ This package provides the backend daemon of the freesmartphone.org software
+ stack. It provides all telephone related features, such as accepting and making
+ calls, receiving and sending SMS and other hardware specifics via a D-Bus
+ interface to the user interface programs.
  .
  This package is part of the freesmartphone.org software stack
  and it is targeted for smartphones.
+
diff --git a/debian/fso-config-general.install b/debian/fso-config-general.install
deleted file mode 100644
index 50c3107..0000000
--- a/debian/fso-config-general.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/frameworkd.conf /etc
diff --git a/debian/fso-frameworkd-gta01.install b/debian/fso-frameworkd-gta01.install
new file mode 100644
index 0000000..59a7d29
--- /dev/null
+++ b/debian/fso-frameworkd-gta01.install
@@ -0,0 +1 @@
+etc/om-gta01/frameworkd.conf /etc
diff --git a/debian/fso-frameworkd-gta02.install b/debian/fso-frameworkd-gta02.install
new file mode 100644
index 0000000..f13b389
--- /dev/null
+++ b/debian/fso-frameworkd-gta02.install
@@ -0,0 +1 @@
+etc/om-gta02/frameworkd.conf /etc
diff --git a/debian/fso-frameworkd.init b/debian/fso-frameworkd.init
old mode 100755
new mode 100644
index 82127f3..c3c738b
--- a/debian/fso-frameworkd.init
+++ b/debian/fso-frameworkd.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:       frameworkd
+# Provides:       fso-frameworkd frameworkd
 # Required-Start: $remote_fs dbus
 # Required-Stop:
 # Default-Start:  2 3 4 5
diff --git a/debian/fso-frameworkd.install b/debian/fso-frameworkd.install
index fb28748..4e93b14 100644
--- a/debian/fso-frameworkd.install
+++ b/debian/fso-frameworkd.install
@@ -1,7 +1,6 @@
-usr/share/doc/fso-frameworkd/examples
 usr/bin
 usr/lib
 etc/dbus-1
 etc/freesmartphone/opreferences/schema
-etc/freesmartphone/ogsmd
-conf/example/frameworkd.conf /usr/share/doc/fso-frameworkd/examples
+etc/freesmartphone/opim
+
diff --git a/debian/fso-frameworkd.lintian-overrides b/debian/fso-frameworkd.lintian-overrides
new file mode 100644
index 0000000..e7642fc
--- /dev/null
+++ b/debian/fso-frameworkd.lintian-overrides
@@ -0,0 +1,6 @@
+fso-frameworkd: binary-without-manpage usr/bin/dump-netlink
+fso-frameworkd: binary-without-manpage usr/bin/frameworkd
+fso-frameworkd: binary-without-manpage usr/bin/opimd_convert_db
+fso-frameworkd: binary-without-manpage usr/bin/opimd_fix_db
+fso-frameworkd: binary-without-manpage usr/bin/remove-tel
+fso-frameworkd: binary-without-manpage usr/bin/cli-framework
\ No newline at end of file
diff --git a/debian/fso-sounds-none.README.Debian b/debian/fso-sounds-none.README.Debian
deleted file mode 100644
index 842c2c3..0000000
--- a/debian/fso-sounds-none.README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-fso-sounds-* packages for Debian
---------------------------------
-
-Please refer to /usr/share/doc/fso-frameworkd/README.Debian, section
-"fso-sounds virtual package", if you want to use the ringtones
-provided by this package with the freesmartphone.org frameworkd.
-
- -- Luca Capello <luca at pca.it>, Wed, 13 May 2009 16:02:06 +0200
-
diff --git a/debian/fso-sounds-none.dirs b/debian/fso-sounds-none.dirs
deleted file mode 100644
index 46ba7f5..0000000
--- a/debian/fso-sounds-none.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/freesmartphone/opreferences/conf/phone
diff --git a/debian/fso-sounds-none.install b/debian/fso-sounds-none.install
deleted file mode 100644
index b6d430d..0000000
--- a/debian/fso-sounds-none.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/none.yaml /usr/share/fso-sounds-rules
diff --git a/debian/fso-sounds-none.postinst b/debian/fso-sounds-none.postinst
deleted file mode 100644
index 443cad3..0000000
--- a/debian/fso-sounds-none.postinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Register the phone file with update-alternatives.
-if [ "$1" = "configure" ]; then
-    update-alternatives \
-	--install \
-	/etc/freesmartphone/opreferences/conf/phone/default.yaml \
-	fso-frameworkd-default-sounds.yaml \
-	/usr/share/fso-sounds-rules/none.yaml \
-	20
-fi
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
diff --git a/debian/fso-sounds-none.prerm b/debian/fso-sounds-none.prerm
deleted file mode 100644
index 73fdb82..0000000
--- a/debian/fso-sounds-none.prerm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Remove the phone file from update-alternatives.
-if [ "$1" = "remove" ]; then
-    update-alternatives \
-	--remove \
-	fso-frameworkd-default-sounds.yaml \
-	/usr/share/fso-sounds-rules/none.yaml
-fi
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
new file mode 100644
index 0000000..172869e
--- /dev/null
+++ b/debian/get-orig-source.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+REV=e3d6339c5d69e0791c4633f86363159e56126075
+VERS=$(dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+NAME=fso-frameworkd
+REPO=git://git.freesmartphone.org/framework.git
+
+# switch to tmp directory
+rm -rf get-orig-source
+mkdir get-orig-source
+cd get-orig-source
+
+# get src from git
+git clone ${REPO} ${NAME}-${REV}
+cd ${NAME}-${REV}
+git archive --format=tar --prefix=${NAME}-${VERS}/ ${REV} > ../${NAME}-${VERS}-tmp.tar
+cd ..
+rm -rf ${NAME}-${REV}
+tar xf ${NAME}-${VERS}-tmp.tar
+rm ${NAME}-${VERS}-tmp.tar
+
+# generate the orig.tar.gz
+GZIP=--best tar czf ../${NAME}_${VERS}.orig.tar.gz ${NAME}-${VERS}
+rm -rf ${NAME}-${VERS}
+
+# remove tmp directory
+cd ..
+rm -rf get-orig-source
+
+echo "  ${NAME}_${VERS}.orig.tar.gz created; move it to the right destination to build the package"
diff --git a/debian/none.yaml b/debian/none.yaml
deleted file mode 100644
index abf6a70..0000000
--- a/debian/none.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Debian ring- and message-tones configuration: no sounds
-
-ring-tone: ""
-ring-volume: 0
-
-message-tone: ""
-message-volume: 0
diff --git a/debian/patches/02_ascii-encode-in-gsm-channel.py.patch b/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
deleted file mode 100644
index 030cf59..0000000
--- a/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use ASCII encoding to Write data to the serial virtual channel
-Index: frameworkd/framework/subsystems/ogsmd/gsm/channel.py
-===================================================================
---- frameworkd.orig/framework/subsystems/ogsmd/gsm/channel.py	2009-02-02 20:02:28.000000000 +0100
-+++ frameworkd/framework/subsystems/ogsmd/gsm/channel.py	2009-02-02 20:09:38.000000000 +0100
-@@ -236,7 +236,7 @@
- 
-     def _lowlevelWrite( self, data ):
-         """Called to write data to the port."""
--        self.serial.write( data )
-+        self.serial.write( data.encode('ascii') )
- 
-     def _readyToSend( self, source, condition ):
-         """Called, if source is ready to receive data."""
diff --git a/debian/patches/04_correct-dbus-paths-for-gypsy.patch b/debian/patches/04_correct-dbus-paths-for-gypsy.patch
deleted file mode 100644
index 3c3bfe8..0000000
--- a/debian/patches/04_correct-dbus-paths-for-gypsy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Gypsy D-Bus belongs to the freedesktop tree
---- fso-frameworkd.orig/etc/dbus-1/system.d/frameworkd.conf
-+++ fso-frameworkd/etc/dbus-1/system.d/frameworkd.conf
-@@ -46,9 +46,9 @@
-     <policy user="root">
-         <allow own="org.freesmartphone.ogpsd"/>
-         <allow own="org.freedesktop.Gypsy"/>
--        <allow send_path="/org/freesmartphone/Gypsy"/>
--        <allow send_destination="org.freesmartphone.Gypsy"/>
--        <allow receive_sender="org.freesmartphone.Gypsy"/>
-+        <allow send_path="/org/freedesktop/Gypsy"/>
-+        <allow send_destination="org.freedesktop.Gypsy"/>
-+        <allow receive_sender="org.freedesktop.Gypsy"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.opreferencesd"/>
diff --git a/debian/patches/05_fix-installprefix-in-config.py.patch b/debian/patches/05_fix-installprefix-in-config.py.patch
deleted file mode 100644
index 5a890e6..0000000
--- a/debian/patches/05_fix-installprefix-in-config.py.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix installprefix for Debian
---- fso-frameworkd.orig/framework/config.py
-+++ fso-frameworkd/framework/config.py
-@@ -97,15 +97,9 @@
- rootlogger.addHandler( handler )
- 
- #
--# 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"
- 
- logging.info( "Installprefix is %s" % installprefix )
- 
diff --git a/debian/patches/06_persist-in-var-lib.patch b/debian/patches/06_persist-in-var-lib.patch
deleted file mode 100644
index 67c7db2..0000000
--- a/debian/patches/06_persist-in-var-lib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-As a proper freesmartphone.org distro, we want persistent data in /var/lib/
-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( MODULE_NAME )
- 
--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":
diff --git a/debian/patches/07_dbus-access-via-busnames.patch b/debian/patches/07_dbus-access-via-busnames.patch
deleted file mode 100644
index d8cb28c..0000000
--- a/debian/patches/07_dbus-access-via-busnames.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Adjust D-Bus config to work with the version of D-Bus in Debian
-Index: frameworkd/etc/dbus-1/system.d/frameworkd.conf
-===================================================================
---- frameworkd.orig/etc/dbus-1/system.d/frameworkd.conf	2009-02-03 10:20:28.000000000 +0100
-+++ frameworkd/etc/dbus-1/system.d/frameworkd.conf	2009-02-03 10:20:50.000000000 +0100
-@@ -4,74 +4,63 @@
-     <policy user="root">
-         <allow own="org.freesmartphone.testing"/>
-         <allow send_path="/org/freesmartphone/Testing"/>
--        <allow send_destination="org.freesmartphone.Testing"/>
--        <allow receive_sender="org.freesmartphone.Testing"/>
-+        <allow send_destination="org.freesmartphone.testing"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.onetworkd"/>
-         <allow send_path="/org/freesmartphone/Network"/>
--        <allow send_destination="org.freesmartphone.Network"/>
--        <allow receive_sender="org.freesmartphone.Network"/>
-+        <allow send_destination="org.freesmartphone.onetworkd"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.frameworkd"/>
-         <allow send_path="/org/freesmartphone/Framework"/>
--        <allow send_destination="org.freesmartphone.Framework"/>
--        <allow receive_sender="org.freesmartphone.Framework"/>
-+        <allow send_destination="org.freesmartphone.framework"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.odeviced"/>
-         <allow send_path="/org/freesmartphone/Device"/>
--        <allow send_destination="org.freesmartphone.Device"/>
--        <allow receive_sender="org.freesmartphone.Device"/>
-+        <allow send_destination="org.freesmartphone.odeviced"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.oeventsd"/>
-         <allow send_path="/org/freesmartphone/Events"/>
--        <allow send_destination="org.freesmartphone.Events"/>
--        <allow receive_sender="org.freesmartphone.Events"/>
-+        <allow send_destination="org.freesmartphone.oeventsd"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.ousaged"/>
-         <allow send_path="/org/freesmartphone/Usage"/>
--        <allow send_destination="org.freesmartphone.Usage"/>
--        <allow receive_sender="org.freesmartphone.Usage"/>
-+        <allow send_destination="org.freesmartphone.ousaged"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.ogsmd"/>
-         <allow send_path="/org/freesmartphone/GSM"/>
--        <allow send_destination="org.freesmartphone.GSM"/>
--        <allow receive_sender="org.freesmartphone.GSM"/>
-+        <allow send_destination="org.freesmartphone.ogsmd"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.ogpsd"/>
-         <allow own="org.freedesktop.Gypsy"/>
-         <allow send_path="/org/freedesktop/Gypsy"/>
-+        <allow send_destination="org.freedesktop.ogpsd"/>
-         <allow send_destination="org.freedesktop.Gypsy"/>
--        <allow receive_sender="org.freedesktop.Gypsy"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.opreferencesd"/>
-         <allow send_path="/org/freesmartphone/Preferences"/>
--        <allow send_destination="org.freesmartphone.Preferences"/>
--        <allow receive_sender="org.freesmartphone.Preferences"/>
-+        <allow send_destination="org.freesmartphone.opreferencesd"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.ophoned"/>
-         <allow send_path="/org/freesmartphone/Phone"/>
--        <allow send_destination="org.freesmartphone.Phone"/>
--        <allow receive_sender="org.freesmartphone.Phone"/>
-+        <allow send_destination="org.freesmartphone.ophoned"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.opimd"/>
-         <allow send_path="/org/freesmartphone/PIM"/>
--        <allow send_destination="org.freesmartphone.PIM"/>
--        <allow receive_sender="org.freesmartphone.PIM"/>
-+        <allow send_destination="org.freesmartphone.opimd"/>
-     </policy>
-     <policy user="root">
-         <allow own="org.freesmartphone.otimed"/>
-         <allow send_path="/org/freesmartphone/Time"/>
--        <allow send_destination="org.freesmartphone.Time"/>
--        <allow receive_sender="org.freesmartphone.Time"/>
-+        <allow send_destination="org.freesmartphone.otimed"/>
-     </policy>
- </busconfig>
diff --git a/debian/patches/09_make-upstream-frameworkd.conf-generic.patch b/debian/patches/09_make-upstream-frameworkd.conf-generic.patch
deleted file mode 100644
index 2d6e5fd..0000000
--- a/debian/patches/09_make-upstream-frameworkd.conf-generic.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Disable all specific services, so it can be provided by the
-fso-config-generic package (plus some small fixes)
---- fso-frameworkd.orig/conf/example/frameworkd.conf
-+++ fso-frameworkd/conf/example/frameworkd.conf
-@@ -2,6 +2,7 @@
- # indicates this configuration version, do not change
- version = 1
- # the default log_level, if not specified per module
-+# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
- log_level = INFO
- # the global log_destination. Uncomment to enable
- log_to = stderr
-@@ -14,9 +15,8 @@
- rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone
- 
- [odeviced]
--# set log level for a subsystem or for an individual module
--# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
--log_level = INFO
-+# set 1 to disable a module
-+disable = 0
- 
- [odeviced.kernel26]
- # set 1 to disable a module
-@@ -29,13 +29,15 @@
- fb_blank = 1
- 
- [odeviced.audio]
-+# set 1 to disable a module
-+disable = 1
- # set directory where the alsa audio scenarios are stored
- scenario_dir = /usr/share/openmoko/scenarios
- # set default scenario loaded at startup
- default_scenario = stereoout
- 
- [odeviced.idlenotifier]
--# add inut nodes to ignore for idle activity
-+# add input nodes to ignore for idle activity
- ignoreinput = 2,3,4
- # configure timeouts (in seconds) here. A value of 0
- # means 'never fall into this state' (except programatically)
-@@ -46,6 +48,8 @@
- suspend = 0
- 
- [odeviced.input]
-+# set 1 to disable a module
-+disable = 1
- # format is <keyname>,<type>,<input device keycode>,<report held seconds in addition to press/release>
- report1 = AUX,key,169,1
- report2 = POWER,key,116,1
-@@ -53,10 +57,12 @@
- report4 = HEADSET,switch,2,0
- 
- [odeviced.powercontrol-neo]
--disable = 0
-+# set 1 to disable a module
-+disable = 1
- 
- [ogsmd]
--disable = 0
-+# set 1 to disable a module
-+disable = 1
- # choose your modem type, available types are: ti_calypso, freescale_neptune, singleline, muxed4line, option, ...
- modemtype = ti_calypso
- # if you have a ti_calypso, you can choose the deep sleep mode. Valid values are: never, adaptive (default), always
-@@ -74,29 +80,32 @@
- #    "aec+nr": Long Echo Cancellation (max) plus Noise Reduction (max) [default]
- #    "none": No audio processing.
- ti_calypso_dsp_mode = aec+nr
--log_level = INFO
- 
- [ogpsd]
-+# set 1 to disable a module
-+disable = 1
- # possible options are NMEADevice, UBXDevice, GTA02Device, EtenDevice
- device = GTA02Device
- # possible options are SerialChannel, GllinChannel, UDPChannel, FileChannel
- channel = SerialChannel
- # For UDPChannel the path defines the port to listen to
- path = /dev/ttySAC1
--log_level = INFO
- 
- [ousaged]
-+# set 1 to disable a module
-+disable = 0
- # choose whether resources should be disabled at startup, at shutdown, always (default), or never.
- sync_resources_with_lifecycle = always
- 
- [opreferencesd]
--log_level = DEBUG
-+# set 1 to disable a module
- disable = 0
--# log_level = DEBUG
-+log_level = DEBUG
- 
- [oeventsd]
-+# set 1 to disable a module
-+disable = 0
- log_level = DEBUG
--disbale = 0
- 
- [opimd]
- contacts_default_backend = CSV-Contacts
diff --git a/debian/patches/fix-message-notfication.patch b/debian/patches/fix-message-notfication.patch
new file mode 100644
index 0000000..e2fd0ea
--- /dev/null
+++ b/debian/patches/fix-message-notfication.patch
@@ -0,0 +1,17 @@
+--- a/framework/subsystems/oeventsd/fso_triggers.py
++++ b/framework/subsystems/oeventsd/fso_triggers.py
+@@ -207,10 +207,10 @@
+         bus = dbus.SystemBus()
+         super(IncomingMessageTrigger, self).__init__(
+             bus,
+-            'org.freesmartphone.ogsmd',
+-            '/org/freesmartphone/GSM/Device',
+-            'org.freesmartphone.GSM.SIM',
+-            'IncomingStoredMessage'
++            'org.freesmartphone.opimd',
++            '/org/freesmartphone/PIM/Messages',
++            'org.freesmartphone.PIM.Messages',
++            'IncomingMessage'
+         )
+     def on_signal(self, index):
+         logger.info("Receive IncomingMessage on index = %s" % index)
diff --git a/debian/patches/fix-ogpsd.patch b/debian/patches/fix-ogpsd.patch
new file mode 100644
index 0000000..46d1976
--- /dev/null
+++ b/debian/patches/fix-ogpsd.patch
@@ -0,0 +1,4 @@
+--- /dev/null
++++ b/framework/subsystems/ogpsd/__init__.py
+@@ -0,0 +1 @@
++
diff --git a/debian/patches/01_adjust-etc-path-in-setup.py.patch b/debian/patches/fix-setup.py
similarity index 64%
rename from debian/patches/01_adjust-etc-path-in-setup.py.patch
rename to debian/patches/fix-setup.py
index 4b59290..ba16eec 100644
--- a/debian/patches/01_adjust-etc-path-in-setup.py.patch
+++ b/debian/patches/fix-setup.py
@@ -1,37 +1,41 @@
-Adjust installation paths for Debian
---- fso-frameworkd.orig/setup.py
-+++ fso-frameworkd/setup.py
-@@ -24,19 +24,19 @@
-     packages = packages,
-     scripts = [ "framework/frameworkd", "tools/cli-framework", "tools/dump-netlink" ],
+--- a/setup.py
++++ b/setup.py
+@@ -25,22 +25,22 @@
+     package_data={'framework/subsystems/opimd': ["db/*.sql"]},
+     scripts = [ "framework/frameworkd", "tools/cli-framework", "tools/dump-netlink", "tools/remove-tel", "tools/opimd_fix_db", "tools/opimd_convert_db" ],
      data_files = [
 -        ("../../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ),
+-        ("../../etc/init.d", ["etc/init.d/frameworkd"] ),
 -        ("../../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/phone",      ["etc/freesmartphone/opreferences/conf/phone/vibrate.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/ring.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/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/vibrate.yaml"]),
+-        ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/ring.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/init.d", ["etc/init.d/frameworkd"] ),
 +        ("/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/phone",      ["etc/freesmartphone/opreferences/conf/phone/vibrate.yaml"]),
++        ("/etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/ring.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/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/vibrate.yaml"]),
++        ("/etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/ring.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" ) ),
++        ("/etc/freesmartphone/persist",                      ["etc/freesmartphone/persist/README"]),
+         ("freesmartphone/examples/", getDir( "examples" ) ),
      ]
  )
diff --git a/debian/patches/series b/debian/patches/series
index c20e250..a5a1f21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-01_adjust-etc-path-in-setup.py.patch
-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
-07_dbus-access-via-busnames.patch
-09_make-upstream-frameworkd.conf-generic.patch
+fix-setup.py
+fix-ogpsd.patch
+fix-message-notfication.patch
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/rules b/debian/rules
index cf24b8c..7286ab5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,11 @@
 #!/usr/bin/make -f
+DEB_PYTHON_SYSTEM=pysupport
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+DEB_DESTDIR = $(CURDIR)/debian/tmp
 
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh build
-	cp conf/example/frameworkd.conf debian/
-	touch build-stamp
-
-clean: unpatch
-	rm -f debian/frameworkd.conf
-	rm -f build-stamp
-	rm -f install-stamp
-	dh clean
-
-install: build install-stamp
-install-stamp:
-	# Run this first
-	dh install
-	dh_compress -X.py
-	dh install --after dh_compress
-	touch install-stamp
-
-binary-arch: install
-	dh binary-arch
-
-binary-indep: install
-	dh binary-indep
-
-binary: binary-arch binary-indep
-
+get-orig-source::
+	sh debian/get-orig-source.sh
diff --git a/debian/snapshot-release.sh b/debian/snapshot-release.sh
old mode 100755
new mode 100644
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
FSO frameworkd Debian packaging

More information about the pkg-fso-commits mailing list