bump version number, add some docs to README, and update TODO

diff --git a/README b/README
index 4c54789e137e4a3a93c63b41f0cca35769ad514e..a62708ef3a26e6de8afcc81092618fd7e58c29cb 100644 (file)
--- a/README
+++ b/README
@@ -1,15 +1,23 @@
+NOTE: This is the FSO branch of pyneo's gsm0710muxd. FSO
+branched around version 0.9.1 in order to no have to change
+dbus interfaces and power handling in ogsmd.
+
+It is planned to merge with upstream after 1.0, although
+they have slightly different goals.
+
 This is a user space multiplexer for GSM according to the
-GSM 07.10 specification. Right now it contains some hardcoded
+GSM 07.10 specification. Although it contains some hardcoded
 paths for the Openmoko Neo devices, it should work with all
 kinds of modems that understand the +CMUX operation mode.
 
 Please send patches to smartphones-standards@lists.linuxtogo.org
 
-See src/gsm0710muxd.c for how to use it.
+gsm0710muxd has dbus system bus activation support, API docs
+are at http://docs.freesmartphone.org -> org.freesmartphone.GSM.MUX
 
-Although gsm0710muxd has dbus system bus activation support, for now
-you need to start it manually because it expects the -x parameter
-(path to GSM power and reset sysfs nodes). 
+NOTE: This is the FSO branch of pyneo's gsm0710muxd. Upstream
+continued to develop gsm0710muxd elsewhere. We're planning
+to merge with upstream again at some point of time.
 
 :M:
 

diff --git a/TODO b/TODO
index 32b1b57d0274e46fa71b20bdfecdc2abdbc5fd5a..3ca1254e706df17978558a647c93a39903f1e14b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,9 +1,10 @@
+0.9.7:
+* do not mess with power -- leave that to others
+
 0.9.8:
-* make power cycle on startup and power-off on shutdown optional
 * document or fix virtual channel behaviour (state is preserved)
 
 0.9.9:
-* Remove VC-not-getting-opened workaround and solve problem
 * Don't assume the modem is in AT mode, make seamless MUX-restart possible
 
 1.0:
@@ -17,8 +18,6 @@
 Quitting(signal), GetNumberOfChannels(i)
 * Automatic device detection and/or device plugins?
 * More support for working around different modems' problems
-* Maintain device database for maximum numbers of allowed channels
 
 1.2:
 * make dbus API support optional (./configure --disable-dbus --static-devices=4)
-

diff --git a/configure.ac b/configure.ac
index 1b9602e5e565d408ec98bad079d7eb807c1c5820..81b60599afda5c469dad98d47e2559b2d28021bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(gsm0710muxd, 0.9.3)
+AM_INIT_AUTOMAKE(gsm0710muxd, 0.9.3.1)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE