Updated Debian control files and documentation

diff --git a/README b/README
index 18418ae..5d54699 100644 (file)
--- a/README
+++ b/README
@@ -27,24 +27,24 @@ Bluetooth:
 USB:
 1. Connect host and N900 with a USB cable.
 2. Wait until the USB mode dialog pops up on the N900 and dismiss it.
-3. Open MAD Developer.
-4. Tap "Manage USB".
-5. Tap "Load g_ether".
+3. Open the status menu (the small icons to the right of the clock)
+4. Tap "Toggle USB Networking"
+5. Start surfing
 6. The USB mode is kept between cable disconnects, you only have to
    reload the g_ether module after a reboot or mode change.
-7. Start surfing on the host.
-3a.It is also possible to load the module from the Terminal (untested):
+3a.It is also possible to load the module from the Terminal:
 rmmod g_nokia
 rmmod g_file_storage
 modprobe g_ether
 
 Notes:
 
-IP addresses are currently hardcoded into the program. A later version
-will add support for an external configuration file.
-The assigned addresses are the following:
-USB: N900: 192.168.253.254 DHCP: 192.168.253.1-192.168.253.253
-Bluetooth: N900: 192.168.254.254 DHCP: 192.168.254.1-192.168.254.253
+IP addresses are assigned dynamically from the 192.168.255.0/24 range.
+Each network device gets a /30 subnet, of which the first address
+will be assigned to the N900 and the second provided via DHCP.
+This gives the following addresses for the first interface (usually
+Bluetooth): N900: 192.168.255.1 Host: 192.168.255.2
+And the second device: N900: 192.168.255.5 Host: 192.168.255.6
 
 If you connect while no GPRS/UMTS connection is active, forwarding will
 not be enabled. This is the case when the device is connected to a

diff --git a/debian/changelog b/debian/changelog
index a1c2843..20d002c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
 mtetherd (0.2-1) unstable; urgency=low
 
-  * Added status menu button to enable/disable USB networking
+  * Implemented mtetherd as status plugin
+  * Enabling and disabling USB networking is now possible via the GUI
 
- -- Gregor Riepl <onitake@gmail.com>  Tue, 27 Jul 2010 23:48:00 +0200
+ -- Gregor Riepl <onitake@gmail.com>  Thu, 5 Aug 2010 16:22:33 +0200
 
 mtetherd (0.1-1) unstable; urgency=low
 
   * Initial release
 
  -- Gregor Riepl <onitake@gmail.com>  Fri, 23 Jul 2010 21:28:22 +0200
-

diff --git a/debian/control b/debian/control
index a4a7b08..fcebea6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,12 @@ Description: Enable tethering via USB networking and Bluetooth PAN
  You can also use it to automatically configure network interfaces
  for development.
  .
- To use tethering via USB, you also need mad-developer installed to
- activate g_ether, or you can do it manually via the console.
+ USB networking can be enabled and disabled via the status menu.
  .
- You can connect to your N900 through the following IPs:
- USB: 192.168.253.254
- Bluetooth: 192.168.254.254
+ IP addresses are now assigned in a more dynamic way.
+ 192.168.255.0/24 is reserved for all network interfaces,
+ each of which gets a /30. The first network device will thus receive
+ the following configuration:
+ IP: 192.168.255.1
+ Netmask: 255.255.255.252
+ DHCP address of partner: 192.168.255.2

diff --git a/debian/postinst b/debian/postinst
index fe27a4f..1f5ba8a 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -21,7 +21,6 @@ set -e
 case "$1" in
     configure)
         update-sudoers
-        start mtetherd
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/debian/prerm b/debian/prerm
index 7c63929..eaace95 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -19,7 +19,6 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-        stop mtetherd
     ;;
 
     failed-upgrade)