Get package much closer

6 files changed, 26 insertions, 28 deletions

diff --git a/debian/control b/debian/control
index 3dfa875..7f9418b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: getxbook
 Section: net
 Priority: optional
 Maintainer: Nick White <debian@njw.me.uk>
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends:
 Standards-Version: 3.8.4
 Homepage: http://njw.me.uk/software/getxbook
 
diff --git a/debian/menu b/debian/menu
index 560b267..2f06818 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,4 +1,4 @@
 ?package(getxbook):needs="X11"\
   section="Applications/Network/File Transfer"\
-  icon="/usr/share/pixmaps/getgbook.xpm"\
+  icon="/usr/share/pixmaps/getxbook.xpm"\
   title="getxbook" command="/usr/bin/getxbookgui"
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..04346d0
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+test "$1" = "configure" && test -x /usr/bin/update-menus \
+  && update-menus
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..04346d0
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,3 @@
+#!/bin/sh
+test "$1" = "configure" && test -x /usr/bin/update-menus \
+  && update-menus
diff --git a/debian/rules b/debian/rules
index 18a0c50..09f9f1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,36 +9,27 @@ build:
 binary: binary-arch binary-indep
 
 binary-arch: build
+	$(MAKE) DESTDIR=$(DESTDIR) PREFIX=/usr install
+	mkdir -p $(DESTDIR)/usr/share/applications
+	cp -f debian/$(package).desktop $(DESTDIR)/usr/share/applications/
+	mkdir -p $(DESTDIR)/usr/share/menu
+	cp -f debian/menu $(DESTDIR)/usr/share/menu/$(package)
+	mkdir -p $(DESTDIR)/usr/share/doc/$(package)
+	cp -f debian/copyright debian/changelog $(DESTDIR)/usr/share/doc/$(package)
+	for i in getabook getbnbook getgbook; \
+	  do strip $(DESTDIR)/usr/bin/$$i; done
+	for i in getabook getbnbook getgbook getxbook getxbookgui; \
+	  do gzip -9 $(DESTDIR)/usr/share/man/man1/$$i.1; done
+	mkdir -p $(DESTDIR)/DEBIAN
+	cp -f debian/postinst debian/postrm $(DESTDIR)/DEBIAN/
+	chmod 755 $(DESTDIR)/DEBIAN/post*
+	dpkg-gencontrol -P$(DESTDIR)
+	dpkg-deb -b $(DESTDIR) ../
 
 binary-indep: build
-	$(MAKE) DESTDIR=$(DESTDIR) PREFIX=/usr
-	mkdir -p $(DESTDIR)/share/applications
-	cp -f $(package).desktop $(DESTDIR)/usr/share/applications/
-	mkdir -p $(DESTDIR)/usr/lib/menu
-	cp -f menu $(DESTDIR)/usr/lib/menu/$(package).menu
-	# TODO: gzip docs
-	# TODO: strip binaries
-	dpkg-deb -b $(DESTDIR) ../
 
 clean:
 	make clean
-	rm -r debian/$(package)
+	rm -rf debian/$(package)
 
 .PHONY: build binary binary-arch binary-indep clean
-
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
-
-override_dh_auto_install:
-	$(MAKE) DESTDIR=$(CURDIR)/debian/getxbook PREFIX=/usr install
-	dh_install debian/getxbook.desktop usr/share/applications/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)