debian: update packaging, add changelog entries

[i3/i3status] / debian / rules

diff --git a/debian/rules b/debian/rules
index 82bdb4b4ad95e78a91135b96c7c95b9eb296ea91..2fa8f3796e76b8afbfbed14ccb3b3e69880f6b2d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,68 +9,41 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build-i3status: clean
-       dh_testdir
-       $(MAKE) EXTRA_CFLAGS="-DDZEN"
-       touch $@
+build: build-arch build-indep
 
-build-i3status-wmii: clean
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
        dh_testdir
-       # Ensure that i3status is rebuilt
-       $(MAKE) clean
        $(MAKE)
        touch $@
 
 clean: 
        dh_testdir
        dh_testroot
-       rm -f build-stamp config.status
+       rm -f build-stamp config.status man/*.xml
        [ ! -f Makefile ] || $(MAKE) distclean
        dh_clean 
 
-install: install-i3status install-i3status-wmii
-
-install-i3status: build-i3status
+install: build
        dh_testdir
        dh_testroot
+       dh_clean -k
        dh_installdirs
        $(MAKE) DESTDIR=$(CURDIR)/debian/i3status/ install
 
-install-i3status-wmii: build-i3status-wmii
-       dh_testdir
-       dh_testroot
-       dh_installdirs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/i3status-wmii/ install
-
+# Build architecture-independent files here.
 binary-indep: build install
+# We have nothing to do by default.
 
-binary-arch: binary-i3status binary-i3status-wmii
-
-binary-i3status: build-i3status
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_installinit
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary-i3status-wmii: build-i3status-wmii
+# Build architecture-dependent files here.
+binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs
        dh_installdocs
        dh_installexamples
-       dh_installinit
        dh_installman
        dh_link
        dh_strip