[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, gismo-debian-split-config, updated. debian/0.2.0-git20080909-6-19-g9875aaf

Mon Nov 3 23:05:40 UTC 2008

The following commit has been merged in the gismo-debian-split-config branch:
commit 9875aaf7106aba594715f04c5695204eed098225
Author: Luca Capello <luca at pca.it>
Date:   Tue Nov 4 00:05:27 2008 +0100

    new binary package fso-config-general

diff --git a/debian/README.Debian b/debian/README.Debian
index 1a3c1ad..802a62d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -19,7 +19,8 @@ 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.
+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".
@@ -76,4 +77,4 @@ Please follow these commands:
 Check the update-alternatives manpage for further information about
 how to manage the different alternatives.
 
- -- Luca Capello <luca at pca.it>, Fri, 31 Oct 2008 13:24:19 +0100
+ -- Luca Capello <luca at pca.it>, Mon,  3 Nov 2008 23:57:36 +0100
diff --git a/debian/changelog b/debian/changelog
index acb5c15..5f01978 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,15 @@ fso-frameworkd (0.2.0-git20080909-7) UNRELEASED; urgency=low
   * 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: removed
+  * 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.
@@ -33,6 +36,7 @@ fso-frameworkd (0.2.0-git20080909-7) UNRELEASED; urgency=low
     + 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.
diff --git a/debian/control b/debian/control
index ad598a3..398233c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,19 @@ Description: freesmartphone.org Framework Daemon - wireless glue
  This package is part of the freesmartphone.org software stack and is targeted
  for smartphones.
 
+Package: fso-config-general
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.2.0-git20080909-7), fso-sounds-openmoko-nonfree | fso-sounds
+Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
+Replaces: fso-config
+Provides: fso-config
+Description: general configuration files for FSO frameworkd
+ This packages provides the FSO frameworkd configuration file.  It
+ also depends on the default fso-sounds package.
+ .
+ This package is part of the freesmartphone.org software stack and is targeted
+ for smartphones.
+
 Package: fso-sounds-none
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/conf/example/frameworkd.conf b/debian/frameworkd.conf
similarity index 71%
copy from conf/example/frameworkd.conf
copy to debian/frameworkd.conf
index ec6e84a..9c47b3a 100644
--- a/conf/example/frameworkd.conf
+++ b/debian/frameworkd.conf
@@ -1,31 +1,32 @@
 [frameworkd]
 # indicates this configuration version, do not change
 version = 1
-# the default log_level, if not specified per module
+# 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 log level for a subsystem or for an individual module
-# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
+# set 1 to disable a module
+disable = 0
 log_level = INFO
 
 [odeviced.kernel26]
-# set 1 to disable a module
 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
+#scenario_dir = /usr/share/openmoko/scenarios
 # set default scenario loaded at startup
-default_scenario = stereoout
+#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
+# configure timeouts (in seconds) here. A value of 0 
 # means 'never fall into this state' (except programatically)
 idle = 10
 idle_dim = 20
@@ -35,23 +36,24 @@ 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
+#report1 = AUX,key,169,1
+#report2 = POWER,key,116,1
+#report3 = CHARGER,key,356,0
+#report4 = HEADSET,switch,2,0
 
-[odeviced.powercontrol-neo]
-disable = 0
+#[odeviced.powercontrol-neo]
+#disable = 1
 
 [ogsmd]
-disable = 0
-modemtype = ti_calypso
+disable = 1
+#modemtype = ti_calypso
 log_level = INFO
 
 [ogpsd]
-device = UBXDevice
-channel = SerialChannel
-path = /dev/ttyACM0
+disable = 1
+#device = UBXDevice
+#channel = SerialChannel
+#path = /dev/ttyACM0
 log_level = INFO
 
 [opreferencesd]
diff --git a/debian/fso-config-general.install b/debian/fso-config-general.install
new file mode 100644
index 0000000..50c3107
--- /dev/null
+++ b/debian/fso-config-general.install
@@ -0,0 +1 @@
+debian/frameworkd.conf /etc
diff --git a/debian/rules b/debian/rules
index e475067..7a01127 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ install: build install-stamp
 install-stamp:
 	# Run this first
 	dh install --until dh_auto_install
+	dh_install -pfso-config-general
 	dh_install -pfso-sounds-none
 	dh_install -pfso-frameworkd-wireless-glue
 	dh_install -pfso-frameworkd -X.so

-- 
FSO frameworkd Debian packaging

