Modify debian package to use the new name, remove initscript as it makes no sense for dzen2

5 files changed, 14 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 00abff1..6ebd743 100644
--- a/Makefile
+++ b/Makefile
@@ -21,14 +21,13 @@ distclean: clean
 
 install:
 	install -m 755 -d $(DESTDIR)/usr/bin
-	install -m 755 -d $(DESTDIR)/etc/init.d
+	install -m 755 -d $(DESTDIR)/etc
 	install -m 755 -d $(DESTDIR)/usr/share/man/man1
 	install -m 755 i3status $(DESTDIR)/usr/bin/i3status
-	install -m 755 i3status.init $(DESTDIR)/etc/init.d/i3status
 	install -m 644 i3status.conf $(DESTDIR)/etc/i3status.conf
 	install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
 
 release:
-	tar cjf i3status.tar.bz2 *.c *.h *.1 *.conf *.init Makefile
+	tar cjf i3status.tar.bz2 *.c *.h *.1 *.conf Makefile
 
 all: i3status
diff --git a/debian/changelog b/debian/changelog
index fc1ec07..7ba58d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-wmiistatus (1.0-1) unstable; urgency=low
+i3status (1.0-1) unstable; urgency=low
 
   * Initial release
 
- -- Michael Stapelberg <michael+mxallowd@stapelberg.de>  Fri, 24 Oct 2008 21:30:42 +0200
+ -- Michael Stapelberg <michael+i3status@stapelberg.de>  Fri, 17 Apr 2009 13:35:00 +0200
diff --git a/debian/control b/debian/control
index f68d6b0..c071a69 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
-Source: wmiistatus
+Source: i3status
 Section: utils
 Priority: optional
-Maintainer: Michael Stapelberg <michael+wmiistatus@stapelberg.de>
+Maintainer: Michael Stapelberg <michael+i3status@stapelberg.de>
 Standards-Version: 3.7.3
-Homepage: http://michael.stapelberg.de/wmiistatus
+Homepage: http://michael.stapelberg.de/i3status
 
-Package: wmiistatus
+Package: i3status
 Architecture: any
 Priority: optional
 Section: utils
 Depends: ${shlibs:Depends}
-Description: little application to fill up wmii's status bar
- wmiistatus is a program running in background and filling up wmii's status bar
- using wmiis plan9 pseudo file system (therefore, you need 9pfs).
+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).
diff --git a/debian/rules b/debian/rules
index a49c84a..07c0fd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/wmiistatus.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/wmiistatus/ install
-	cp $(CURDIR)/wmiistatus.init $(CURDIR)/debian
+	# Add here commands to install the package into debian/i3status.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/i3status/ install
 
 
 # Build architecture-independent files here.
diff --git a/i3status.init b/i3status.init
deleted file mode 100755
index 9b5ea6d..0000000
--- a/i3status.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides:          i3status
-# Required-Start:
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Generates a status line for dzen2 or wmii
-# Description:       Generates a status line for dzen2 or wmii
-### END INIT INFO
-
-# For the pidfile, you must be root. i3status itself runs as user just fine
-[ $(id -ru) -eq 0 ] || { echo "You need to be root"; exit 1; }
-
-. /lib/lsb/init-functions
-
-case "$1" in
-start)	log_daemon_msg "Starting wmii status bar filler" "i3status"
-	start-stop-daemon --start --background --quiet --make-pidfile --pidfile /var/run/i3status.pid --name i3status --startas /usr/bin/i3status
-	log_end_msg $?
-	;;
-stop)	log_daemon_msg "Stopping wmii status bar filler" "i3status"
-	start-stop-daemon --stop --quiet --pidfile /var/run/i3status.pid --name i3status
-	log_end_msg $?
-	;;
-restart|reload|force-reload)	log_daemon_msg "Restarting wmii status bar filler" "i3status"
-	start-stop-daemon --stop --retry 5 --quiet --pidfile /var/run/i3status.pid --name i3status
-	start-stop-daemon --start --background --quiet --make-pidfile --pidfile /var/run/i3status.pid --name i3status --startas /usr/bin/i3status
-	;;
-*)	log_action_msg "Usage: $0 {start|stop|restart|reload|force-reload}"
-	exit 2
-	;;
-esac
-exit 0