6 files changed, 10 insertions, 81 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 0817a80..8b0480e 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,15 +2,8 @@
 When using i3status with dzen2 support (i3status)
 -------------------------------------------------
 
-It is recommended to start i3status after starting your window manage, ideally
+It is recommended to start i3status after starting your window manager, ideally
 using your window manager's configuration file.
 
 Launching i3status in combination with dzen2 could look like this:
 i3status | dzen2 -fg white -ta r -w 1280 -dock
-
------------------------------------------------------
-When using i3status with wmii support (i3status-wmii)
------------------------------------------------------
-
-Enable the initscript for i3status-wmii in /etc/default/i3status-wmii
-and configure the path to your wmii mountpoint in /etc/i3status.conf
diff --git a/debian/changelog b/debian/changelog
index be35d90..35143d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-i3status (1.3-0) unstable; urgency=low
+i3status (2.0-0) unstable; urgency=low
 
   * Not yet released
 
diff --git a/debian/control b/debian/control
index 76971c0..1df1312 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Michael Stapelberg <michael@stapelberg.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), libiw-dev
+Build-Depends: debhelper (>= 5), libiw-dev, libconfuse-dev
 Standards-Version: 3.8.2
 Homepage: http://i3.zekjur.net/i3status
 
@@ -12,9 +12,10 @@ Architecture: any
 Priority: extra
 Section: utils
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: dzen2 | wmii
-Description: Generates a status line for dzen2 or wmii
- i3status is a program running in background, feeding dzen2 or filling up
- wmii's status bar using wmiis plan9 pseudo file system (therefore, you
- need 9pfs) by combining several system information (current IP addresses,
- battery status, date/time, system load, etc.).
+Recommends: dzen2 | xmobar
+Enhances: dzen2, xmobar
+Description: Generates a status line for dzen2 or xmobar
+ i3status is a small program (less than 1000 SLOC) for generating a status bar
+ for dzen2, xmobar or similar programs by combining several information about
+ your system (IP addresses of your interfaces, load, current date/time, ESSID
+ of the network you are associated to, disk status, and so on).
diff --git a/debian/i3status.i3status-wmii.default b/debian/i3status.i3status-wmii.default
deleted file mode 100644
index 15b2883..0000000
--- a/debian/i3status.i3status-wmii.default
+++ /dev/null
@@ -1,9 +0,0 @@
-### i3status-wmii settings ###
-
-## run i3status-wmii: yes, no
-## default: no
-I3STATUS_WMII_ENABLE=no
-
-## additional options:
-## -c <configfile>
-I3STATUS_WMII_OPTIONS=""
diff --git a/debian/i3status.i3status-wmii.init b/debian/i3status.i3status-wmii.init
deleted file mode 100755
index 401718a..0000000
--- a/debian/i3status.i3status-wmii.init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides:          i3status-wmii
-# Required-Start:    $remote_fs $network
-# Required-Stop:     $remote_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Generates a status line for wmii
-# Description:       Combines several system information into a status line for
-#                    wmii.
-### END INIT INFO
-
-need_root() {
-	# For the pidfile, you must be root. i3status itself works as user
-	[ $(id -ru) -eq 0 ] || { echo "You need to be root"; exit 1; }
-}
-
-[ -f /etc/default/i3status-wmii ] && . /etc/default/i3status-wmii
-
-if [ "$I3STATUS_WMII_ENABLE" != "yes" ]
-then
-	echo "Not starting i3status-wmii (Not enabled in /etc/default/i3status-wmii)"
-	exit 0
-fi
-
-. /lib/lsb/init-functions
-
-case "$1" in
-start)	need_root
-	log_daemon_msg "Starting wmii status bar filler" "i3status-wmii"
-	start-stop-daemon --start --background --quiet --make-pidfile --pidfile /var/run/i3status-wmii.pid --name i3status-wmii --startas /usr/bin/i3status-wmii
-	log_end_msg $?
-	;;
-stop)	need_root
-	log_daemon_msg "Stopping wmii status bar filler" "i3status-wmii"
-	start-stop-daemon --stop --quiet --pidfile /var/run/i3status-wmii.pid --name i3status-wmii
-	log_end_msg $?
-	;;
-restart|reload|force-reload)	need_root
-	log_daemon_msg "Restarting wmii status bar filler" "i3status-wmii"
-	start-stop-daemon --stop --retry 5 --quiet --pidfile /var/run/i3status-wmii.pid --name i3status-wmii
-	start-stop-daemon --start --background --quiet --make-pidfile --pidfile /var/run/i3status-wmii.pid --name i3status-wmii --startas /usr/bin/i3status-wmii
-	;;
-*)	log_action_msg "Usage: $0 {start|stop|restart|reload|force-reload}"
-	exit 2
-	;;
-esac
-exit 0
diff --git a/debian/rules b/debian/rules
index 3543851..692d31d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,6 @@ build: build-stamp
 
 build-stamp:
 	dh_testdir
-	# Build with wmii support
-	$(MAKE)
-	cp $(CURDIR)/i3status $(CURDIR)/i3status-wmii
 	# Build with xmobar support
 	$(MAKE) distclean
 	$(MAKE) EXTRA_CFLAGS="-DXMOBAR"
@@ -30,7 +27,6 @@ clean:
 	dh_testroot
 	rm -f build-stamp config.status
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f $(CURDIR)/i3status-wmii
 	dh_clean 
 
 install: build
@@ -39,9 +35,7 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/i3status/ install
-	install -m 755 $(CURDIR)/i3status-wmii $(CURDIR)/debian/i3status/usr/bin/i3status-wmii
 	install -m 755 $(CURDIR)/i3status-xmobar $(CURDIR)/debian/i3status/usr/bin/i3status-xmobar
-	dh_link usr/share/man/man1/i3status.1 usr/share/man/man1/i3status-wmii.1
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -54,7 +48,6 @@ binary-arch: build install
 	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-	dh_installinit --name i3status-wmii
 	dh_installman
 	dh_link
 	dh_strip