From ab40e32c856178e8ea2ea778975447f1f87c0b8b Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Wed, 28 Jul 2010 13:44:55 -0400
Subject: [PATCH] install, manpages, rules: update package build/install
 procedures to use configure && make && make install

---
 debian/changelog |  2 ++
 debian/install   |  9 +++++----
 debian/manpages  |  9 ---------
 debian/rules     | 23 +++++++++++++++--------
 4 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 debian/manpages

diff --git a/debian/changelog b/debian/changelog
index 660b7c9f..de7eb1c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ byobu (3.0) unreleased; urgency=low
       Unix/Linux distro) to $(./configure && make && make install) byobu!
       LP: #609851, #608995, #503554
     - I think this is a significant enough milestone to bump version to 3.0
+  * install, manpages, rules: update package build/install procedures to
+    use configure && make && make install
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 07 Jul 2010 11:36:03 -0400
 
diff --git a/debian/install b/debian/install
index 72c0c1bf..4f0ff406 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
-etc/*
-usr/*
-debian/source_byobu.py usr/share/apport/package-hooks
-debian/lintian/byobu usr/share/lintian/overrides
+/usr
+../../etc/byobu/socketdir etc/byobu/
+../../etc/byobu/statusrc etc/byobu/
+../../debian/source_byobu.py usr/share/apport/package-hooks
+../../debian/lintian/byobu usr/share/lintian/overrides
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 05f6d798..00000000
--- a/debian/manpages
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/share/man/man1/byobu-select-profile.1
-usr/share/man/man1/byobu-launcher.1
-usr/share/man/man1/byobu-reconnect-sockets.1
-usr/share/man/man1/byobu-status.1
-usr/share/man/man1/shell.1
-usr/share/man/man1/byobu-export.1
-usr/share/man/man1/byobu-config.1
-usr/share/man/man1/byobu-status-detail.1
-usr/share/man/man1/byobu.1
diff --git a/debian/rules b/debian/rules
index 91be2d62..58df0f8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,8 @@ VER=`head -n 1 debian/changelog | sed 's/^.*(//' | sed 's/).*//' | sed 's/-.*//'
 install-po: update-pot
 	for po in po/*.po ; do \
 		lang=$${po#po/}; lang=$${lang%.po}; \
-		mkdir -p usr/share/locale/$${lang}/LC_MESSAGES/; \
-		msgfmt $${po} -o usr/share/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
+		mkdir -p debian/tmp/usr/share/locale/$${lang}/LC_MESSAGES/; \
+		msgfmt $${po} -o debian/tmp/usr/share/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
 	done
 
 update-pot:
@@ -22,12 +22,21 @@ update-pot:
 		msgmerge $${po} po/${PKG}.pot -o $${po} ; \
 	done
 
-prebuild:
+prebuild: clean
+	dh_testdir
+	aclocal
+	automake --add-missing
+	autoconf
+	./configure --prefix=/usr
 
-build:
+build: prebuild
+	dh_testdir
+	$(MAKE)
 
 clean:
+	dh_testdir
 	dh_clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	for po in po/*.po ; do \
 		lang=$${po#po/}; lang=$${lang%.po}; \
 		rm -f po/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
@@ -36,17 +45,15 @@ clean:
 install: build install-po
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	dh_link usr/share/byobu/keybindings/f-keys usr/share/byobu/keybindings/common
 	dh_link usr/bin/shell usr/bin/motd+shell
-	dh_install -X.bzr
-
-# Everything else is handled by dh_install
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
+	dh_install -X.bzr --fail-missing --sourcedir=debian/tmp -i
 	dh_installdocs -X.bzr -i
 	dh_installman -i
 	dh_installchangelogs -i