--- fso-frameworkd-0.8.5.1.orig/debian/fso-frameworkd.init +++ fso-frameworkd-0.8.5.1/debian/fso-frameworkd.init @@ -0,0 +1,60 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: frameworkd +# Required-Start: $remote_fs dbus +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Short-Description: freesmartphone.org framework daemon +### END INIT INFO + +set -e + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DESC="freesmartphone.org framework daemon" +NAME=frameworkd +DAEMON=/usr/bin/frameworkd +PIDDIR=/var/run/ +PIDFILE=${PIDDIR}/${NAME}.pid +CONFFILE=/etc/frameworkd.conf + + +# Gracefully exit if the package has been removed (but not purged). +[ -x "$DAEMON" ] || exit 0 + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +. /lib/lsb/init-functions + + +case "$1" in + start) + if [ ! -r "$CONFFILE" ]; then + echo "No $CONFFILE found, frameworkd cannot start." + echo + echo "Please read /usr/share/doc/fso-frameworkd/README.Debian." + exit 0 + fi + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + start-stop-daemon --start --pidfile ${PIDFILE} --make-pidfile --background --exec ${DAEMON} + [ "$VERBOSE" != no ] && log_end_msg $? + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + start-stop-daemon --stop --pidfile ${PIDFILE} --oknodo + [ "$VERBOSE" != no ] && log_end_msg $? + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + + +exit 0 --- fso-frameworkd-0.8.5.1.orig/debian/fso-sounds-none.install +++ fso-frameworkd-0.8.5.1/debian/fso-sounds-none.install @@ -0,0 +1 @@ +debian/none.yaml /usr/share/fso-sounds-rules --- fso-frameworkd-0.8.5.1.orig/debian/control +++ fso-frameworkd-0.8.5.1/debian/control @@ -0,0 +1,52 @@ +Source: fso-frameworkd +Section: misc +Priority: extra +Maintainer: Debian freesmartphone.org Team +Uploaders: Joachim Breitner , Luca Capello +Build-Depends: debhelper (>= 7), cython, python-support (>= 0.6), python-dev (>= 2.5), quilt (>= 0.40) +Standards-Version: 3.8.1 +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, dbus, alsa-utils, ppp +Recommends: fso-config, fso-sounds +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 +Provides: frameworkd +Description: freesmartphone.org Framework Daemon + This packages 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-config-general +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. + . + This package is part of the freesmartphone.org software stack + and it is targeted for smartphones. + +Package: fso-sounds-none +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. + . + This package is part of the freesmartphone.org software stack + and it is targeted for smartphones. --- fso-frameworkd-0.8.5.1.orig/debian/watch +++ fso-frameworkd-0.8.5.1/debian/watch @@ -0,0 +1 @@ +# Upstream does not have any tarball, thus no need for a watch file. --- fso-frameworkd-0.8.5.1.orig/debian/README.Debian +++ fso-frameworkd-0.8.5.1/debian/README.Debian @@ -0,0 +1,80 @@ +fso-frameworkd for Debian +------------------------- + +Debian ships a device-agnostic freesmartphone.org frameworkd. For +this reason, fso-frameworkd alone will not even start, because it is +missing the configuration files. + +Strictly speaking, to start, freesmartphone.org frameworkd needs only +the main configuration file, namely /etc/frameworkd.conf (of which an +example is in /usr/share/doc/fso-frameworkd/examples/frameworkd.conf). +However, to fully use fso-frameworkd, please install the appropriate +fso-config-* and fso-sounds-* packages. + + +* fso-config virtual package + +Whenever frameworkd is known to work on a specific device, a Debian +package should be created, containing all the necessary configuration +files: mandatory are frameworkd.conf and the scenario ones, but the +package can also ship other files as needed (e.g. a udev rules file or +the opreferences ones). The package must provide the virtual package +fso-config and its name must be in the form fso-config-$DEVICE. The +fso-config-general package can be used as an example. + +If you want to know a list of all availables fso-config-* package, +please use `apt-cache showpkg fso-config`, section "Reverse Provides". + + +* fso-sounds virtual package + +At least two sound files are needed, the ring- and message-tones, to +be placed in /usr/share/sounds. Each package shipping these two +sounds must provide the virtual package fso-sounds and its name must +be in the form fso-sounds-$ORIGIN. + +The default upstream freesmartphone.org frameworkd profile lists these +sounds in /etc/freesmartphone/opreferences/conf/phone/default.yaml. +However, to allow an easier customization, each fso-sounds-* package +should provide a phone file named after the $ORIGIN part of the +package name, to be installed into /usr/share/fso-sounds-rules. This +file should then be registered as an alternative for the upstream +default file through update-alternatives. The fso-sounds-none package +can be used as an example. + +If you want to know a list of all availables fso-sounds-* package, +please use `apt-cache showpkg fso-sounds`, section "Reverse Provides". + + +* local configuration for the ring- and message-tones + +If you do not want to install any fso-sounds-* package at all, you +should create your own local configuration file and register it as an +alternative for the upstream default file through update-alternatives. +The local configuration must have the highest alternative priority to +preserve it as the default alternative in case an fso-sounds-* package +is installed. + +NB, sounds file should be in /usr/share/sounds and the extension + should always be specified. + +Please follow these commands: + + $ cat </usr/local/share/fso-frameworkd-default-sounds-local.yaml + # Debian ring- and message-tones configuration: local + ring-tone: "$RING_FILE" + ring-volume: $RING_VOLUME + message-tone: "$MESSAGE_FILE" + message-volume: $MESSAGE_VOLUME + EOF + $ update-alternatives \ + --install \ + /etc/freesmartphone/opreferences/conf/phone/default.yaml \ + fso-frameworkd-default-sounds.yaml \ + /usr/local/share/fso-frameworkd-default-sounds-local.yaml \ + 100 + +Check the update-alternatives manpage for further information about +how to manage the different alternatives. + + -- Luca Capello , Fri, 15 May 2009 23:16:05 +0200 --- fso-frameworkd-0.8.5.1.orig/debian/fso-frameworkd.dirs +++ fso-frameworkd-0.8.5.1/debian/fso-frameworkd.dirs @@ -0,0 +1 @@ +/var/lib/freesmartphone/ --- fso-frameworkd-0.8.5.1.orig/debian/snapshot-release.sh +++ fso-frameworkd-0.8.5.1/debian/snapshot-release.sh @@ -0,0 +1,68 @@ +#!/bin/bash + +set -e + +# This script is used by nomeata to +# * Create a tarball from the upstream git branch +# * Insert it into pristine tar +# * Merge it into Debian +# * Create a new debian/changelog entry + +# It requires the upstream/$VERSION tag to be set + +VERSION=$1 + +if [ -z "$VERSION" -o "$VERSION" = "--help" ] +then + echo "Usage:" + echo " $0 " + echo "Whereas a tag upstream/ exists" + exit 0 +fi + +if [ ! -e .git ] +then + echo "Please run in the root of the git tree" + exit 1 +fi + + +TARBALL=../fso-frameworkd_"$VERSION".orig.tar.gz +TAG="upstream/$VERSION" + +if ! git tag -l "$TAG" | fgrep -q "$TAG" +then + echo "Tag $TAG not found" + exit 1 +fi + +if ! git status | fgrep -q 'nothing to commit' +then + echo "Uncommited changes:" + git status + exit 1 +fi + +set -x + +git-archive --format=tar --prefix=frameworkd-"$VERSION"/ "$TAG" | \ + gzip -9 > $TARBALL + +pristine-tar -m "New upstream tarball + +Generated by: +git-archive --format=tar --prefix=frameworkd-$VERSION/ "$TAG" | \ + gzip -9 > ../fso-frameworkd_$VERSION.orig.tar.gz" \ + commit "$TARBALL" "$TAG" + +git checkout debian + +git merge "$TAG" + +# Even if the last entry was UNRELEASED, we want a new one +dch --release-heuristic log --distribution UNRELEASED --newversion "$VERSION-1" \ + -m "New upstream release" + +git commit debian/changelog -m "Entry about new upstream version $VERSION" + +echo "Done!" --- fso-frameworkd-0.8.5.1.orig/debian/fso-config-general.install +++ fso-frameworkd-0.8.5.1/debian/fso-config-general.install @@ -0,0 +1 @@ +debian/frameworkd.conf /etc --- fso-frameworkd-0.8.5.1.orig/debian/none.yaml +++ fso-frameworkd-0.8.5.1/debian/none.yaml @@ -0,0 +1,7 @@ +# Debian ring- and message-tones configuration: no sounds + +ring-tone: "" +ring-volume: 0 + +message-tone: "" +message-volume: 0 --- fso-frameworkd-0.8.5.1.orig/debian/changelog +++ fso-frameworkd-0.8.5.1/debian/changelog @@ -0,0 +1,345 @@ +fso-frameworkd (0.8.5.1-1) unstable; urgency=low + + * New upstream release: milestone 5.1. + * debian/frameworkd.conf: + - remove, use upstream example instead. + * debian/patches/series: update. + * debian/patches/01_adjust-etc-path-in-setup.py.patch: + + refresh. + + add missing patch description, thanks to lintian. + * debian/patches/02_ascii-encode-in-gsm-channel.py.patch: + + add missing patch description, thanks to lintian. + * debian/patches/04_correct-dbus-paths-for-gypsy.patch: + + refresh. + + add missing patch description, thanks to lintian. + * debian/patches/05_fix-installprefix-in-config.py.patch: + + refresh. + + add missing patch description, thanks to lintian. + * debian/patches/07_dbus-access-via-busnames.patch: + + add missing patch description, thanks to lintian. + * debian/patches/08_typo-in-shebang-line.patch: + - remove, applied upstream. + * debian/patches/09_make-upstream-frameworkd.conf-generic.patch: + + disable all specific services, so it can be provided by the + fso-config-generic package. + * debian/rules: + + copy/clean conf/example/frameworkd.conf in debian/. + + -- Luca Capello Sat, 06 Jun 2009 19:50:35 +0200 + +fso-frameworkd (0.8.4.9-20090130-4) unstable; urgency=low + + * Upload to unstable. + * debian/control: + + Standards-Version to 3.8.1, no changes needed. + + s/fso-sounds-openmoko-nonfree/fso-sounds-yue-base/ for the + fso-config-general binary package. + + correct typos in Description:. + + fix capitalization for freesmartphone.org. + + use freesmartphone.org instead of the FSO acronym. + + minimize differences with non-freesmartphone.org packages in + the last sentence of the long Description:. + * debian/copyright: + + update Debian copyright assignment to 2009. + * debian/fso-frameworkd.preinst: + + add "#DEBHELPER#" token, thanks to lintian. + * debian/fso-sounds-none.postinst: + + add "#DEBHELPER#" token, thanks to lintian. + * debian/fso-sounds-none.prerm: + + add "#DEBHELPER#" token, thanks to lintian. + * debian/fso-sounds-none.README.Debian: + + suggest fso-frameworkd documentation to use the ringtones. + * debian/patches/series: update. + * debian/patches/06_persist-in-var-lib.patch: + + use freesmartphone.org instead of the FSO acronym. + * debian/patches/08_typo-in-shebang-line.patch: + + upstream commit b0c5547fd50b3cba2574a3f58c5e054f8d6dc27e, + fix typo in framework/patters/null.py, thanks to lintian. + * debian/README.Debian: + + use freesmartphone.org instead of the FSO acronym. + * debian/watch: + + new file, thanks to lintian. + + -- Luca Capello Wed, 27 May 2009 23:30:08 +0200 + +fso-frameworkd (0.8.4.9-20090130-3) pkg-fso; urgency=low + + * Depend on fso-gsm0710muxd + + -- Joachim Breitner Fri, 20 Feb 2009 14:03:26 +0100 + +fso-frameworkd (0.8.4.9-20090130-2) pkg-fso; urgency=low + + * 07_dbus-access-via-busnames.patch: Adjust dbus config to work with the + current version of dbus in Debian + + -- Joachim Breitner Tue, 03 Feb 2009 10:23:32 +0100 + +fso-frameworkd (0.8.4.9-20090130-1) pkg-fso; urgency=low + + * New upstream release. This is milestone 5. + * This package does not contain any arch-specific parts. The wireless glue + package is removed. + * Fix "debian/copyright: mention that copyright holder of + decorator.py is Michele Simionato" (Closes: #511471) + + -- Joachim Breitner Mon, 02 Feb 2009 22:42:33 +0100 + +fso-frameworkd (0.8.4.3-20081215-1) pkg-fso; urgency=low + + * New upstream release + + -- Joachim Breitner Mon, 15 Dec 2008 23:59:43 +0100 + +fso-frameworkd (0.8.4.3-20081130-1) pkg-fso; urgency=low + + * New upstream release + + -- Joachim Breitner Sun, 30 Nov 2008 14:34:51 +0100 + +fso-frameworkd (0.8.4.3-20081123-1) pkg-fso; urgency=low + + * New upstream release + + -- Joachim Breitner Sun, 23 Nov 2008 12:26:47 +0100 + +fso-frameworkd (0.8.4.3-20081118-2) pkg-fso; urgency=low + + * Typo in openmoko-panel-plugin package name + + -- Joachim Breitner Tue, 18 Nov 2008 16:08:31 +0100 + +fso-frameworkd (0.8.4.3-20081118-1) pkg-fso; urgency=low + + * New snapshot from upstream stablization branch + + -- Joachim Breitner Tue, 18 Nov 2008 16:00:15 +0100 + +fso-frameworkd (0.8.4.3-1) UNRELEASED; urgency=low + + * New upstream release “milestone4” + * Updated version number to reflect what they do in OE + * 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 + * Conflict with earlier versions of python2.5, due to #505318 in previous + versions + * Conflict with pre-milestone4 versions of openmoko-panel-plugins + + -- Joachim Breitner Tue, 11 Nov 2008 16:59:56 +0100 + +fso-frameworkd (0.2.0-git20080909-7) pkg-fso; urgency=low + + * FSO frameworkd is now device-agnostic! + * debian/55-freerunner.rules: removed. + * debian/control: + + Recommends: the fso-config and fso-sounds virtual packages. + + Replaces: previous versions. + + new binary package fso-config-general. + + new binary package fso-sounds-none. + - remove gstreamer0.10-plugins-good, gstreamer0.10-plugins-bad + and gstreamer0.10-plugins-ugly from Depends:, they must be + pulled in by the fso-sounds-* packages, as they are specific + to each sound format. + * debian/frameworkd.conf: + + now for a general and device-agnostic installation. + * debian/fso-config-general.install: new file. + * debian/fso-frameworkd.init: + + do not start frameworkd if /etc/frameworkd.conf is not found, + instead print a message and exit without error. + * debian/fso-frameworkd.install: + + install conf/example/frameworkd.conf in the document folder. + - do not install the configuration files, they are now provided + by the fso-config virtual package. + - do not install the sound files, they are now provided by the + fso-sounds virtual package. + * debian/fso-frameworkd.preinst: + + backup the old configuration rules files if they have been + modified, since they are now provided by the fso-config + virtual package. + * debian/fso-sounds-none.*: new files. + * debian/NEWS: new file. + * debian/none.yaml: new file. + * debian/README.Debian: + + explain the need for /etc/frameworkd.conf. + + explain what a fso-config-* package is and contains. + + explain what a fso-sounds-* package is and contains. + + explain how to create a local configuration for the sounds and + register it as alternative with the highest priority. + * debian/rules: + + install fso-config-general files. + + install fso-sounds-none files. + - no more need to generate the debian/sounds/*. + * debian/scenarios: removed. + * debian/sounds.base64: removed (Closes: #495668). + + -- Luca Capello Wed, 05 Nov 2008 03:52:38 +0100 + +fso-frameworkd (0.2.0-git20080909-6) pkg-fso; urgency=low + + * debian/patches/series: update. + * debian/patches/06_backport-fix-for-fso-140.patch: + + backport upstream fix for GPRS (ticket #140), thanks to Martin + Giraud-Sauveur for having informed me + and Timo Juhani Lindfors for the patch. + + -- Luca Capello Wed, 08 Oct 2008 16:48:20 +0200 + +fso-frameworkd (0.2.0-git20080909-5) pkg-fso; urgency=low + + * Restore upstream sources, modifications to upstream files must + be managed through a Debian-specific patch system. + * The Debian patches are now managed through quilt. + * debian/control: + + Build-Depends: on quilt. + * debian/frameworkd.conf: new file. + * debian/fso-frameworkd.init: correct typo in stop clause. + * debian/fso-frameworkd.install: + + install debian/frameworkd.conf in /etc. + + install debian/scenarios in /usr/share/openmoko. + + install debian/sounds/* in /usr/share/sounds. + * debian/patches/series: new file. + * debian/patches/01_adjust-etc-path-in-setup.py.patch: new file. + * 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/rules: + + adapt to quilt. + + create SID sound files in debian/sounds. + * debian/scenarios: new files. + * debian/sounds.base64: new files. + + -- Luca Capello Sun, 05 Oct 2008 22:12:44 +0200 + +fso-frameworkd (0.2.0-git20080909-4) pkg-fso; urgency=low + + * Move to team maintenance: Debian FreeSmartphone.Org Team + http://pkg-fso.alioth.debian.org + * debian/control: + + add myself to Uploaders: + + update Vcs-* fields to fso-frameworkd + + Build-Depends: on python-dev, thanks to Timo Juhani Lindfors + (Closes: #500044) + + Depends: on ppp, thanks to Martin Giraud-Sauveur + + + -- Luca Capello Fri, 26 Sep 2008 17:40:02 +0200 + +fso-frameworkd (0.2.0-git20080909-3) pkg-fso; urgency=low + + * fixed installprefix for Debian, so frameworkd finds it sound files again + + -- Joachim Breitner Fri, 12 Sep 2008 14:48:53 +0200 + +fso-frameworkd (0.2.0-git20080909-2) pkg-fso; urgency=low + + * Fix self-made import bug in audio.py + + -- Joachim Breitner Fri, 12 Sep 2008 01:48:24 +0200 + +fso-frameworkd (0.2.0-git20080909-1) pkg-fso; urgency=low + + * New upstream release: milestone3 + * Left over patches: + + ascii encode before sending to serial console + + accept unknown ntypes + + adjust Gypsy D-Bus names in /etc/dbus-1/system.d/frameworkd.conf + + -- Joachim Breitner Fri, 12 Sep 2008 00:31:17 +0200 + +fso-frameworkd (0.2.0-git20080805-8) pkg-fso; urgency=low + + * Add debian/pyversion, specifying 2.5 + + -- Joachim Breitner Tue, 26 Aug 2008 22:48:58 +0200 + +fso-frameworkd (0.2.0-git20080805-7) pkg-fso; urgency=low + + * Brown paper bag bug: import sys + + -- Joachim Breitner Sat, 23 Aug 2008 17:57:54 +0200 + +fso-frameworkd (0.2.0-git20080805-6) pkg-fso; urgency=low + + * Make unknown number types non-fatal for now (Closes: #494781) + + -- Joachim Breitner Sat, 23 Aug 2008 15:59:07 +0200 + +fso-frameworkd (0.2.0-git20080805-5) pkg-fso; urgency=low + + * Workaround for #90, revert when fixed upstream + * Added copyright file and package description + + -- Joachim Breitner Sat, 16 Aug 2008 18:09:11 -0300 + +fso-frameworkd (0.2.0-git20080805-4) pkg-fso; urgency=low + + * Rename to fso-frameworkd + * Split out arch-dependant fso-frameworkd-wireless-glue + * Add gstreamer libs to Dependencies + + -- Joachim Breitner Tue, 12 Aug 2008 18:51:22 -0300 + +frameworkd (0.2.0-git20080805-3) pkg-fso; urgency=low + + * Explicitly depend on alsa-utils + * Explicitly depend on dbus + + -- Joachim Breitner Mon, 11 Aug 2008 11:05:32 -0300 + +frameworkd (0.2.0-git20080805-2) pkg-fso; urgency=low + + [ Luca Capello ] + * debian/control: add Vcs-* fields + * debian/control: depend on gsm0710muxd and python-dbus + * debian/frameworkd.init: convert to LSB format + + [ Joachim Breitner ] + * Improved configuration file + * Include udev rules file in frameworkd + + Cherry picked from upstream: + * ogsmd: Convert ntype to int in SimRetrieveEntry like in + SimRetrievePhonebook + * Accept number type 185 + + -- Joachim Breitner Mon, 11 Aug 2008 00:11:30 -0300 + +frameworkd (0.2.0-git20080805-1) pkg-fso; urgency=low + + [ Joachim Breitner ] + * Unpack .sid file in rules + * Debian changelog + * Add gbp.conf file + * Store .sid file as base64 + * Proper version number + * install ringtone and depend on gst sid support + + [ Daniel Willmann ] + * ousaged: Make the Bluetooth device actually (de-)activate bluetooth + * ogsmd: Append the subscriber numbers as name, number tuple. + * ogsmd: Use right method _rightHandSide in SimGetSimInfo + + [ Joachim Breitner ] + * Include openmoko scenario files + * hmm, commit --amend and merge do not seem to like each other + * Proper ogsmd settings + * ERROR-less config file + * Install frameworkd.conf from the FSO image + * Depend on python-gst0.10 + * adjust /etc path + * Depend on python-yaml + * Add init script + * Depend on python-serial + * Debian Checking + + [ Guillaume Chereau ] + * Added test for opreferencesd + + [ Joachim Breitner ] + * use framework in module path + * Clean up more files + + -- Joachim Breitner Fri, 08 Aug 2008 11:22:51 -0300 --- fso-frameworkd-0.8.5.1.orig/debian/compat +++ fso-frameworkd-0.8.5.1/debian/compat @@ -0,0 +1 @@ +7 --- fso-frameworkd-0.8.5.1.orig/debian/copyright +++ fso-frameworkd-0.8.5.1/debian/copyright @@ -0,0 +1,85 @@ +This package was debianized by Joachim Breitner on +Fri, 08 Aug 2008 11:22:51 -0300 + +It was downloaded from git://git.freesmartphone.org/frameworkd.git + +The following copyrights apply to the frameworkd sourcecode: + * Copyright © 2008-2009 Openmoko, Inc. + * Copyright © 2008-2009 Jan 'Shoragan' Lübbe + * Copyright © 2008-2009 Michael 'Mickey' Lauer + * Copyright © 2008-2009 Daniel Willmann + * Copyright © 2008 John Lee + * Copyright © 2007-2008 M. Dietrich. + * Copyright © 2008 Guillaume 'Charlie' Chereau + * Copyright © 2006 Adam Sampson + * Copyright © 2003, 2004, 2005, 2006 Red Hat Inc. + * Copyright © 2003 David Zeuthen + * Copyright © 2004 Rob Taylor + * Copyright © 2005, 2006 Collabora Ltd. + * Copyright © 2007 John (J5) Palmieri + * Copyright © 2001, 2002, Russell Nelson + * Copyright © Michele Simionato + * Copyright © 2003 Paul Scott-Murphy + * Copyright © 2007-2008 Peter V. Saveliev + * Copyright © 2008 Stefan Schmidt + * Copyright © 2008 by Soeren Apel + + +For the Debian packaging: + * Copyright © 2008-2009 Joachim Breitner + * Copyright © 2008-2009 Luca Capello + +The frameworkd source, excluding files mentioned below, and the Debian package +are distributed under the following license: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + +On Debian systems, the complete text of the GNU General Public License can +be found in /usr/share/common-licenses/GPL-2 file. + +The file ./tests/tasklet.py the content of ./framework/cxnet are distributed +under the following license: + + Tichy is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Tichy is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public License can +be found in /usr/share/common-licenses/GPL-3 file. + +The file framework/patterns/decorator.py is distributed under the following +license: + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + Redistributions in bytecode form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. --- fso-frameworkd-0.8.5.1.orig/debian/fso-frameworkd.preinst +++ fso-frameworkd-0.8.5.1/debian/fso-frameworkd.preinst @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +### start of http://wiki.debian.org/DpkgConffileHandling ### +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "0.2.0-git20080909-6"; then + for I in /etc/frameworkd.conf \ + /etc/freesmartphone/oevents/rules.yaml \ + /etc/freesmartphone/opreferences/conf/phone/default.yaml \ + /etc/freesmartphone/opreferences/conf/phone/silent.yaml \ + /etc/freesmartphone/opreferences/conf/profiles/default.yaml \ + /etc/udev/rules.d/55-freerunner.rules; do + rm_conffile fso-frameworkd "$I" + done + fi + ;; + *) + ;; +esac +### end of http://wiki.debian.org/DpkgConffileHandling ### + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- fso-frameworkd-0.8.5.1.orig/debian/fso-frameworkd.install +++ fso-frameworkd-0.8.5.1/debian/fso-frameworkd.install @@ -0,0 +1,7 @@ +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 --- fso-frameworkd-0.8.5.1.orig/debian/NEWS +++ fso-frameworkd-0.8.5.1/debian/NEWS @@ -0,0 +1,10 @@ +fso-frameworkd (0.2.0-git20080909-7) pkg-fso; urgency=low + + Starting with this version, fso-frameworkd does not provide anymore + the configuration and sound files: this because fso-frameworkd is + designed to be device-agnostic. + + Please install the fso-config-* package specific to your device and the + fso-sounds-* package containing the ring- and message-tones you prefer. + + -- Luca Capello Wed, 29 Oct 2008 04:10:13 +0100 --- fso-frameworkd-0.8.5.1.orig/debian/fso-sounds-none.dirs +++ fso-frameworkd-0.8.5.1/debian/fso-sounds-none.dirs @@ -0,0 +1 @@ +etc/freesmartphone/opreferences/conf/phone --- fso-frameworkd-0.8.5.1.orig/debian/pyversions +++ fso-frameworkd-0.8.5.1/debian/pyversions @@ -0,0 +1 @@ +2.5- --- fso-frameworkd-0.8.5.1.orig/debian/fso-sounds-none.README.Debian +++ fso-frameworkd-0.8.5.1/debian/fso-sounds-none.README.Debian @@ -0,0 +1,9 @@ +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 , Wed, 13 May 2009 16:02:06 +0200 + --- fso-frameworkd-0.8.5.1.orig/debian/fso-sounds-none.postinst +++ fso-frameworkd-0.8.5.1/debian/fso-sounds-none.postinst @@ -0,0 +1,19 @@ +#!/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# --- fso-frameworkd-0.8.5.1.orig/debian/fso-sounds-none.prerm +++ fso-frameworkd-0.8.5.1/debian/fso-sounds-none.prerm @@ -0,0 +1,17 @@ +#!/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# --- fso-frameworkd-0.8.5.1.orig/debian/rules +++ fso-frameworkd-0.8.5.1/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + + +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 + --- fso-frameworkd-0.8.5.1.orig/debian/patches/02_ascii-encode-in-gsm-channel.py.patch +++ fso-frameworkd-0.8.5.1/debian/patches/02_ascii-encode-in-gsm-channel.py.patch @@ -0,0 +1,14 @@ +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.""" --- fso-frameworkd-0.8.5.1.orig/debian/patches/05_fix-installprefix-in-config.py.patch +++ fso-frameworkd-0.8.5.1/debian/patches/05_fix-installprefix-in-config.py.patch @@ -0,0 +1,21 @@ +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 ) + --- fso-frameworkd-0.8.5.1.orig/debian/patches/09_make-upstream-frameworkd.conf-generic.patch +++ fso-frameworkd-0.8.5.1/debian/patches/09_make-upstream-frameworkd.conf-generic.patch @@ -0,0 +1,103 @@ +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 ,,, + 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 --- fso-frameworkd-0.8.5.1.orig/debian/patches/01_adjust-etc-path-in-setup.py.patch +++ fso-frameworkd-0.8.5.1/debian/patches/01_adjust-etc-path-in-setup.py.patch @@ -0,0 +1,37 @@ +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" ], + 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/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"]), ++ ("/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-0.8.5.1.orig/debian/patches/series +++ fso-frameworkd-0.8.5.1/debian/patches/series @@ -0,0 +1,7 @@ +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 --- fso-frameworkd-0.8.5.1.orig/debian/patches/06_persist-in-var-lib.patch +++ fso-frameworkd-0.8.5.1/debian/patches/06_persist-in-var-lib.patch @@ -0,0 +1,16 @@ +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": --- fso-frameworkd-0.8.5.1.orig/debian/patches/07_dbus-access-via-busnames.patch +++ fso-frameworkd-0.8.5.1/debian/patches/07_dbus-access-via-busnames.patch @@ -0,0 +1,92 @@ +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 @@ + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + + + + ++ + +- + + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + + + +- +- ++ + + --- fso-frameworkd-0.8.5.1.orig/debian/patches/04_correct-dbus-paths-for-gypsy.patch +++ fso-frameworkd-0.8.5.1/debian/patches/04_correct-dbus-paths-for-gypsy.patch @@ -0,0 +1,16 @@ +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 @@ + + + +- +- +- ++ ++ ++ + + + --- fso-frameworkd-0.8.5.1.orig/debian/patches/08_typo-in-shebang-line.patch +++ fso-frameworkd-0.8.5.1/debian/patches/08_typo-in-shebang-line.patch @@ -0,0 +1,19 @@ +From: Joachim Breitner +Date: Mon, 2 Feb 2009 19:20:38 +0000 (+0100) +Subject: typo in shebang line: /user/bin/env +X-Git-Tag: milestone5.1~35 +X-Git-Url: http://git.freesmartphone.org/?p=framework.git;a=commitdiff_plain;h=b0c5547fd50b3cba2574a3f58c5e054f8d6dc27e + +typo in shebang line: /user/bin/env +--- + +diff --git a/framework/patterns/null.py b/framework/patterns/null.py +index 8851ebe..85d797c 100644 +--- a/framework/patterns/null.py ++++ b/framework/patterns/null.py +@@ -1,4 +1,4 @@ +-#!/user/bin/env python ++#!/usr/bin/env python + + """null.py +