Make lintian clean

4 files changed, 19 insertions, 15 deletions

diff --git a/debian/control b/debian/control
index 7f9418b..e6c988f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: net
 Priority: optional
 Maintainer: Nick White <debian@njw.me.uk>
 Build-Depends:
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://njw.me.uk/software/getxbook
 
 Package: getxbook
 Architecture: any
-Depends: tcl, tk
+Depends: ${shlibs:Depends}, tcl, tk
 Description: A collection of tools to download books from websites.
-  getxbook is a collection of tools to download books from
-  Google Books' "Book Preview," Amazon's "Look Inside the
-  Book" and Barnes & Noble's "Book Viewer."
-  .
-  Each tool is written in around 200 lines of portable C code,
-  with no dependencies beyond libc and network sockets. There
-  is an optional graphical interface, using Tcl/Tk.
+ getxbook is a collection of tools to download books from
+ Google Books' "Book Preview," Amazon's "Look Inside the
+ Book" and Barnes & Noble's "Book Viewer."
+ .
+ Each tool is written in around 200 lines of portable C code,
+ with no dependencies beyond libc and network sockets. There
+ is an optional graphical interface, using Tcl/Tk.
diff --git a/debian/postinst b/debian/postinst
index 04346d0..f5ccda3 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
-test "$1" = "configure" && test -x /usr/bin/update-menus \
-  && update-menus
+set -e
+if test -x /usr/bin/update-menus; then update-menus; fi
diff --git a/debian/postrm b/debian/postrm
index 04346d0..f5ccda3 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,3 +1,3 @@
 #!/bin/sh
-test "$1" = "configure" && test -x /usr/bin/update-menus \
-  && update-menus
+set -e
+if test -x /usr/bin/update-menus; then update-menus; fi
diff --git a/debian/rules b/debian/rules
index 09f9f1d..292ee7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,9 @@ binary-arch: build
 	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)
+	cp -f debian/copyright $(DESTDIR)/usr/share/doc/$(package)/
+	cp -f debian/changelog $(DESTDIR)/usr/share/doc/$(package)/changelog.Debian
+	gzip -9 $(DESTDIR)/usr/share/doc/$(package)/changelog.Debian
 	for i in getabook getbnbook getgbook; \
 	  do strip $(DESTDIR)/usr/bin/$$i; done
 	for i in getabook getbnbook getgbook getxbook getxbookgui; \
@@ -23,6 +25,8 @@ binary-arch: build
 	mkdir -p $(DESTDIR)/DEBIAN
 	cp -f debian/postinst debian/postrm $(DESTDIR)/DEBIAN/
 	chmod 755 $(DESTDIR)/DEBIAN/post*
+	dpkg-shlibdeps $(DESTDIR)/usr/bin/getabook \
+	  $(DESTDIR)/usr/bin/getbnbook $(DESTDIR)/usr/bin/getgbook
 	dpkg-gencontrol -P$(DESTDIR)
 	dpkg-deb -b $(DESTDIR) ../
 
@@ -30,6 +34,6 @@ binary-indep: build
 
 clean:
 	make clean
-	rm -rf debian/$(package)
+	rm -rf debian/$(package) debian/files debian/substvars
 
 .PHONY: build binary binary-arch binary-indep clean