[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.8.4.9-20090130-4-41-g5f90659
Luca Capello
luca at pca.it
Sat Jun 6 18:39:35 UTC 2009
The following commit has been merged in the debian branch:
commit 2a09fef25b11dace665b5cc73941ec5bdaeef5ca
Author: Luca Capello <luca at pca.it>
Date: Sat Jun 6 19:50:19 2009 +0200
debian/*: make upstream frameworkd.conf generic and use it
diff --git a/debian/changelog b/debian/changelog
index cf25ca8..f50e6a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
fso-frameworkd (0.8.5.1-1) UNRELEASED; 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.
@@ -17,6 +19,11 @@ fso-frameworkd (0.8.5.1-1) UNRELEASED; urgency=low
+ 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/.
--
diff --git a/debian/frameworkd.conf b/debian/frameworkd.conf
deleted file mode 100644
index 9c47b3a..0000000
--- a/debian/frameworkd.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-[frameworkd]
-# indicates this configuration version, do not change
-version = 1
-# the default log_level, if not specified per subsystem or an individual module
-# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
-log_level = INFO
-
-[odeviced]
-# set 1 to disable a module
-disable = 0
-log_level = INFO
-
-[odeviced.kernel26]
-disable = 0
-# poll capacity once every 5 minutes
-# (usually, you do not have to change this)
-capacity_check_timeout = 300
-
-[odeviced.audio]
-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
-ignoreinput = 2,3,4
-# configure timeouts (in seconds) here. A value of 0
-# means 'never fall into this state' (except programatically)
-idle = 10
-idle_dim = 20
-idle_prelock = 12
-lock = 2
-suspend = 0
-
-[odeviced.input]
-# 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
-#report3 = CHARGER,key,356,0
-#report4 = HEADSET,switch,2,0
-
-#[odeviced.powercontrol-neo]
-#disable = 1
-
-[ogsmd]
-disable = 1
-#modemtype = ti_calypso
-log_level = INFO
-
-[ogpsd]
-disable = 1
-#device = UBXDevice
-#channel = SerialChannel
-#path = /dev/ttyACM0
-log_level = INFO
-
-[opreferencesd]
-log_level = DEBUG
-disable = 0
-rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
-# log_level = DEBUG
-
-[oeventsd]
-log_level = DEBUG
-disbale = 0
-rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
diff --git a/debian/patches/09_make-upstream-frameworkd.conf-generic.patch b/debian/patches/09_make-upstream-frameworkd.conf-generic.patch
new file mode 100644
index 0000000..2d6e5fd
--- /dev/null
+++ b/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 <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/series b/debian/patches/series
index 089755e..c20e250 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
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
diff --git a/debian/rules b/debian/rules
index 2ec7f01..cf24b8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,11 @@ 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
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list