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

1 files changed, 29 insertions, 72 deletions

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