debian: revert packaging to produce only one package, but with both binaries

This commit is contained in:
Michael Stapelberg 2009-06-21 14:50:57 +02:00
parent 098f7bac23
commit a3707bae7e
11 changed files with 44 additions and 443 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
i3status (1.2-1) unstable; urgency=low
* Handle SIGPIPE to avoid zombie processes
* debian: only build one package containing both binaries
-- Michael Stapelberg <michael@stapelberg.de> Sun, 21 Jun 2009 13:58:03 +0200
i3status (1.1-1) unstable; urgency=low i3status (1.1-1) unstable; urgency=low
* Implement getting temperature from thermal zones (Thanks atsutane) * Implement getting temperature from thermal zones (Thanks atsutane)

33
debian/control vendored
View File

@ -4,35 +4,16 @@ Priority: optional
Maintainer: Michael Stapelberg <michael@stapelberg.de> Maintainer: Michael Stapelberg <michael@stapelberg.de>
DM-Upload-Allowed: yes DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 5) Build-Depends: debhelper (>= 5)
Standards-Version: 3.8.2 Standards-Version: 3.7.3
Homepage: http://i3.zekjur.net/i3status Homepage: http://i3.zekjur.net/i3status
Package: i3status-common
Architecture: all
Priority: optional
Section: utils
Depends: ${misc:Depends}
Description: Common files for i3status and i3status-wmii
This package contains the configuration file and documentation for i3status
and i3status-wmii.
Package: i3status Package: i3status
Architecture: any Architecture: any
Priority: optional Priority: optional
Section: utils Section: utils
Depends: ${shlibs:Depends}, ${misc:Depends}, i3status-common Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: dzen2 Recommends: dzen2 | wmii
Description: Generates a status line for dzen2 Description: Generates a status line for dzen2 or wmii
i3status is a program running in background feeding dzen2 with information i3status is a program running in background, feeding dzen2 or filling up
about your system (IP address and speed of your ethernet device, WLAN signal wmii's status bar using wmiis plan9 pseudo file system (therefore, you
strength, load, time, ...). need 9pfs).
Package: i3status-wmii
Architecture: any
Priority: optional
Section: utils
Depends: ${shlibs:Depends}, ${misc:Depends}, i3status-common
Recommends: wmii
Description: Generates a status line for wmii
i3status is a program running in background, filling up wmii's status bar
using wmiis plan9 pseudo file system (therefore, you need 9pfs).

View File

@ -1 +0,0 @@
etc/i3status.conf

158
debian/i3status-wmii.1 vendored
View File

@ -1,158 +0,0 @@
.de Vb \" Begin verbatim text
.ft CW
.nf
.ne \\$1
..
.de Ve \" End verbatim text
.ft R
.fi
..
.TH i3status 1 "MAY 2009" Linux "User Manuals"
.SH NAME
i3status \- Generates a status line for wmii
.SH SYNOPSIS
.B i3status
.RB [\|\-c
.IR configfile \|]
.SH DESCRIPTION
.B i3status
is a small program (around 500 SLOC) for filling wmii's status bar via its 9P
pseudo filesystem. It is designed to be very efficient by issuing a very
small number of systemcalls (as the bar should be updated every second or at
your specified interval). This ensures that even under high load, your status bar
is updated correctly and it saves a little bit of battery life by not spawning
new processes every second like shell scripts do.
.SH CONFIGURATION
.TP
.B wlan
Specifies the name of your WLAN interface (e.g. wlan0 or ath0 or eth1). Don't
specify if you don't have a WLAN interface or if it should not be displayed.
.TP
.B eth
Specifies the name of your ethernet interface (e.g. eth0). Don't specify if you
don't have an ethernet interface or if it should not be displayed.
.TP
.B wmii_path
Specifies the path to the rbar-folder of your mounted wmii pseudo file system
(e.g. /mnt/wmii/rbar/). It has to be terminated by a slash.
.TP
.B time_format
Format for the time/date to be displayed. See strftime(3) or date(1). Don't
specify it if you don't want the time to be shown.
.TP
.B battery
The number of the battery you want to display. This option can be specified
multiple times to display multiple batteries. Don't specify it if you don't
have a battery. To get the number of the specific battery, see
/sys/class/power_supply/BAT*
If you want i3status to use the last full capacity instead of the design capacity
of the battery, specify the f-flag, like this:
.Vb 10
# Use the last full capacity
battery 0,f
.Ve
.TP
.B run_watch
You can specify this directive multiple times. Each line first has a name (one
word, separated by space) followed by a path (can contain wildcards, given to
glob(3)). The path is the path to a PID-file which contains just the process ID
of a process. i3status will then check if the process is still running and
displays "yes" or "no" depending on the status. This is useful for displaying
if your VPN is running, or dhclient for DHCP and so on...
.TP
.B order
Followed by a comma separated list of the modules (run, wlan, eth, battery,
load, time) this directive specifies the order of the information which should
be displayed. An order is accomplished by prefixing the files in wmii's /rbar
directory with a number, that is 0VPN, 1DHCP, 2time and so on..
.TP
.B color
If specified, color mode is on. This affects WLAN which will be displayed red
if WLAN is down and the run_watch system which will display the status in
red/green.
.TP
.B get_ethspeed
Get current speed of the ethernet interface using the same mechanism as
ethtool. You need to start i3status with root privileges to use this.
.TP
.B get_cpu_temperature
Gets the temperature of the first thermal zone or the specified thermal zone
(if any). Use it to display your CPU temperature.
.TP
.B normcolors
Specifies the colors for background/border in the same format (html colorcodes)
as wmii's configuration (just the last two values), that is #222222 #333333 for
example. Text color will be determined automatically (red/green/#888888),
depending on context.
.TP
.B interval
Specifies the interval in which the status bar will be updated. If you got a
very slow system or feel you don't need so much information, you may want to
increase it.
.SH FILES
.TP
.B /etc/i3status.conf
System-wide configuration file.
.SH EXAMPLE CONFIGURATION
.PP
.Vb 10
\&wlan wlan0
\&eth eth0
\&wmii_path /mnt/wmii/rbar/
\&time_format %d.%m.%Y %H:%M:%S
\&battery 0
\&battery 1,f
\&run_watch DHCP /var/run/dhclient*.pid
\&run_watch VPN /var/run/vpnc*.pid
\&order run,wlan,eth,battery,load,time
\&normcolors #000000 #333333
\&color
\&get_cpu_temperature
.Ve
.SH MOUNTING WMII'S PSEUDO FILESYSTEM
As of now (February 2009, Linux 2.6.28) you can mount wmii's 9P pseudo filesystem using:
.PP
.Vb 3
mount -t 9p -o rw,trans=unix,uname=michael,dfltuid=1000,dfltgid=50,name=michael,noauto,noextend /tmp/ns.michael.:0/wmii /mnt/wmii
# Perhaps you need to load module 9pnet_fd if that does not work
modprobe 9pnet_fd
.Ve
.SH BUGS
Sometimes, i3status crashes when the wlan interface vanishes (killswitch). I
haven't yet found the bug, as it is not reproducible. If you can reproduce
this, please fix it and send me a patch.
.SH SEE ALSO
.BR strftime (3),
.BR date (1),
.BR glob (3)
.SH AUTHORS
Michael Stapelberg <michael+i3status at stapelberg dot de>
Thorsten Toepper <atsutane at freethoughts dot de>
.SH WEBSITE
See http://i3.zekjur.net/i3status for the newest release.

View File

@ -1,35 +0,0 @@
#!/bin/sh
#
### BEGIN INIT INFO
# Provides: i3status-wmii
# Required-Start:
# Required-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Generates a status line for wmii
# Description: Generates a status line for 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-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) 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) 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

View File

@ -1 +0,0 @@
debian/i3status-wmii.1

142
debian/i3status.1 vendored
View File

@ -1,142 +0,0 @@
.de Vb \" Begin verbatim text
.ft CW
.nf
.ne \\$1
..
.de Ve \" End verbatim text
.ft R
.fi
..
.TH i3status 1 "JUNE 2009" Linux "User Manuals"
.SH NAME
i3status \- Generates a status line for dzen2
.SH SYNOPSIS
.B i3status
.RB [\|\-c
.IR configfile \|]
.SH DESCRIPTION
.B i3status
is a small program (around 500 SLOC) for filling dzen2. It is designed to be
very efficient by issuing a very small number of systemcalls (as the bar should
be updated every second or at your specified interval). This ensures that even
under high load, your status bar is updated correctly and it saves a little bit
of battery life by not spawning new processes every second like shell scripts do.
.SH CONFIGURATION
.TP
.B wlan
Specifies the name of your WLAN interface (e.g. wlan0 or ath0 or eth1). Don't
specify if you don't have a WLAN interface or if it should not be displayed.
.TP
.B eth
Specifies the name of your ethernet interface (e.g. eth0). Don't specify if you
don't have an ethernet interface or if it should not be displayed.
.TP
.B time_format
Format for the time/date to be displayed. See strftime(3) or date(1). Don't
specify it if you don't want the time to be shown.
.TP
.B battery
The number of the battery you want to display. This option can be specified
multiple times to display multiple batteries. Don't specify it if you don't
have a battery. To get the number of the specific battery, see
/sys/class/power_supply/BAT*
If you want i3status to use the last full capacity instead of the design capacity
of the battery, specify the f-flag, like this:
.Vb 10
# Use the last full capacity
battery 0,f
.Ve
.TP
.B run_watch
You can specify this directive multiple times. Each line first has a name (one
word, separated by space) followed by a path (can contain wildcards, given to
glob(3)). The path is the path to a PID-file which contains just the process ID
of a process. i3status will then check if the process is still running and
displays "yes" or "no" depending on the status. This is useful for displaying
if your VPN is running, or dhclient for DHCP and so on...
.TP
.B order
Followed by a comma separated list of the modules (run, wlan, eth, battery,
load, time) this directive specifies the order of the information which should
be displayed. An order is accomplished by prefixing the files in wmii's /rbar
directory with a number, that is 0VPN, 1DHCP, 2time and so on..
.TP
.B color
If specified, color mode is on. This affects WLAN which will be displayed red
if WLAN is down and the run_watch system which will display the status in
red/green.
.TP
.B get_ethspeed
Get current speed of the ethernet interface using the same mechanism as
ethtool. You need to start i3status with root privileges to use this.
.TP
.B get_cpu_temperature
Gets the temperature of the first thermal zone or the specified thermal zone
(if any). Use it to display your CPU temperature.
.TP
.B normcolors
Specifies the colors for background/border in the same format (html colorcodes)
as wmii's configuration (just the last two values), that is #222222 #333333 for
example. Text color will be determined automatically (red/green/#888888),
depending on context.
.TP
.B interval
Specifies the interval in which the status bar will be updated. If you got a
very slow system or feel you don't need so much information, you may want to
increase it.
.SH FILES
.TP
.B /etc/i3status.conf
System-wide configuration file.
.SH EXAMPLE CONFIGURATION
.PP
.Vb 10
\&wlan wlan0
\&eth eth0
\&time_format %d.%m.%Y %H:%M:%S
\&battery 0
\&battery 1,f
\&run_watch DHCP /var/run/dhclient*.pid
\&run_watch VPN /var/run/vpnc*.pid
\&order run,wlan,eth,battery,load,time
\&normcolors #000000 #333333
\&color
\&get_cpu_temperature
.Ve
.SH BUGS
Sometimes, i3status crashes when the wlan interface vanishes (killswitch). I
haven't yet found the bug, as it is not reproducible. If you can reproduce
this, please fix it and send me a patch.
.SH SEE ALSO
.BR strftime (3),
.BR date (1),
.BR glob (3)
.SH AUTHORS
Michael Stapelberg <michael+i3status at stapelberg dot de>
Thorsten Toepper <atsutane at freethoughts dot de>
.SH WEBSITE
See http://i3.zekjur.net/i3status for the newest release.

View File

@ -1,5 +0,0 @@
It is recommended to start i3status after starting your window manage, 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

View File

@ -1 +0,0 @@
usr/*

View File

@ -1 +0,0 @@
debian/i3status.1

103
debian/rules vendored
View File

@ -9,16 +9,16 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
build-i3status: clean build: build-stamp
dh_testdir
$(MAKE) EXTRA_CFLAGS="-DDZEN"
touch $@
build-i3status-wmii: clean build-stamp:
dh_testdir dh_testdir
# Ensure that i3status is rebuilt # Build with wmii support
$(MAKE) clean
$(MAKE) $(MAKE)
cp $(CURDIR)/i3status $(CURDIR)/i3status-wmii
# Build with dzen support
$(MAKE) clean
$(MAKE) EXTRA_CFLAGS="-DDZEN"
touch $@ touch $@
clean: clean:
@ -26,83 +26,40 @@ clean:
dh_testroot dh_testroot
rm -f build-stamp config.status rm -f build-stamp config.status
[ ! -f Makefile ] || $(MAKE) distclean [ ! -f Makefile ] || $(MAKE) distclean
rm -f $(CURDIR)/i3status-wmii
dh_clean dh_clean
install: install-i3status install-i3status-wmii install: build
install-i3status: build-i3status
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_clean -k
dh_installdirs dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/i3status/ install $(MAKE) DESTDIR=$(CURDIR)/debian/i3status/ install
# Delete files which are in i3status-common install -m 755 $(CURDIR)/i3status-wmii $(CURDIR)/debian/i3status/usr/bin/i3status-wmii
rm -rf $(CURDIR)/debian/i3status/etc
rm -rf $(CURDIR)/debian/i3status/usr/share/man
install-i3status-wmii: build-i3status-wmii
dh_testdir
dh_testroot
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/i3status-wmii/ install
mv $(CURDIR)/debian/i3status-wmii/usr/bin/i3status $(CURDIR)/debian/i3status-wmii/usr/bin/i3status-wmii
mv $(CURDIR)/debian/i3status-wmii/usr/share/man/man1/i3status.1 $(CURDIR)/debian/i3status-wmii/usr/share/man/man1/i3status-wmii.1
# Delete files which are in i3status-common
rm $(CURDIR)/debian/i3status-wmii/etc/i3status.conf
rm -rf $(CURDIR)/debian/i3status-wmii/usr/share/man
# Build architecture-independent files here.
binary-indep: build install binary-indep: build install
mkdir -p $(CURDIR)/debian/i3status-common/etc # We have nothing to do by default.
cp $(CURDIR)/i3status.conf $(CURDIR)/debian/i3status-common/etc/i3status.conf
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_installchangelogs -pi3status-common dh_installchangelogs
dh_installdocs -pi3status-common dh_installdocs
dh_installexamples -pi3status-common dh_installexamples
dh_installinit -pi3status-common dh_installinit --name i3status-wmii
dh_link -pi3status-common dh_installman
dh_strip -pi3status-common dh_link
dh_compress -pi3status-common dh_strip
dh_fixperms -pi3status-common dh_compress
dh_installdeb -pi3status-common dh_fixperms
dh_shlibdeps -pi3status-common dh_installdeb
dh_gencontrol -pi3status-common dh_shlibdeps
dh_md5sums -pi3status-common dh_gencontrol
dh_builddeb -pi3status-common dh_md5sums
dh_builddeb
binary-arch: binary-i3status binary-i3status-wmii
binary-i3status: build-i3status
dh_testdir
dh_testroot
dh_installchangelogs -pi3status
dh_installdocs -pi3status
dh_installman -pi3status
dh_link -pi3status
dh_strip -pi3status
dh_compress -pi3status
dh_fixperms -pi3status
dh_installdeb -pi3status
dh_shlibdeps -pi3status
dh_gencontrol -pi3status
dh_md5sums -pi3status
dh_builddeb -pi3status
binary-i3status-wmii: build-i3status-wmii
dh_testdir
dh_testroot
dh_installchangelogs -pi3status-wmii
dh_installdocs -pi3status-wmii
dh_installinit -pi3status-wmii
dh_installman -pi3status-wmii
dh_link -pi3status-wmii
dh_strip -pi3status-wmii
dh_compress -pi3status-wmii
dh_fixperms -pi3status-wmii
dh_installdeb -pi3status-wmii
dh_shlibdeps -pi3status-wmii
dh_gencontrol -pi3status-wmii
dh_md5sums -pi3status-wmii
dh_builddeb -pi3status-wmii
binary: binary-indep binary-arch binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install .PHONY: build clean binary-indep binary-arch binary install