From 52162d1b8ec7ea5dcce0d37e4e5a4a02da37de1d Mon Sep 17 00:00:00 2001
Message-Id: <52162d1b8ec7ea5dcce0d37e4e5a4a02da37de1d.1713961913.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 29 Nov 2003 20:38:38 +0000
Subject: [PATCH] Debianization fixes.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 configure.in      |  7 +++++--
 debian/.cvsignore |  3 +++
 debian/control    |  5 +++--
 debian/rules      | 19 +++++++++++--------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/configure.in b/configure.in
index 3cafccc..53dae3b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl -*-fundamental-*-
+dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.35 2003/11/29 11:59:17 mdw Exp $
+dnl $Id: configure.in,v 1.36 2003/11/29 20:38:38 mdw Exp $
 dnl
 dnl Configuration script for mLib
 dnl
@@ -29,6 +29,9 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.36  2003/11/29 20:38:38  mdw
+dnl Debianization fixes.
+dnl
 dnl Revision 1.35  2003/11/29 11:59:17  mdw
 dnl Various stuff.
 dnl
diff --git a/debian/.cvsignore b/debian/.cvsignore
index 9af7faf..3243fc7 100644
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1 +1,4 @@
 files mlib-dev tmp substvars *.debhelper
+mlib
+*.substvars
+mlib2
diff --git a/debian/control b/debian/control
index d4a4590..0593f08 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,17 @@ Source: mlib
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@nsict.org>
+Build-Depends: debhelper (>= 4.0.2)
 Standards-Version: 3.1.1
 
-Package: mlib
+Package: mlib2
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: A library of miscellaneous stuff
 
 Package: mlib-dev
 Architecture: any
-Depends: mlib (= ${Source-Version}), libc6-dev
+Depends: mlib2 (= ${Source-Version}), libc6-dev
 Description: A library of miscellaneous stuff
  This package contains the header files and static libraries needed to
  compile programs which use mLib.
diff --git a/debian/rules b/debian/rules
index bf46ff2..83ea361 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #! /usr/bin/make -f
 
+export DH_COMPAT = 4
+
 build:
 	rm -rf deb-build build; mkdir deb-build
 	cd deb-build; ../configure \
@@ -16,16 +18,16 @@ clean:
 
 install: build
 	dh_clean
-	make -C deb-build install DESTDIR=`pwd`/debian/tmp
-	rm -f debian/tmp/usr/lib/*.la
+	make -C deb-build install DESTDIR=`pwd`/debian/mlib2
 	mkdir -p debian/mlib-dev/usr/lib 
 	mkdir -p debian/mlib-dev/usr/share/man
 	mkdir -p debian/mlib-dev/usr/bin
-	mv debian/tmp/usr/bin/mLib-config debian/mlib-dev/usr/bin
-	mv debian/tmp/usr/share/man/man3 debian/mlib-dev/usr/share/man
-	mv debian/tmp/usr/lib/*.a debian/mlib-dev/usr/lib
-	mv debian/tmp/usr/lib/*.so debian/mlib-dev/usr/lib
-	mv debian/tmp/usr/include debian/mlib-dev/usr
+	mv debian/mlib2/usr/bin/mLib-config debian/mlib-dev/usr/bin
+	mv debian/mlib2/usr/share/man/man3 debian/mlib-dev/usr/share/man
+	mv debian/mlib2/usr/lib/*.a debian/mlib-dev/usr/lib
+	mv debian/mlib2/usr/lib/*.so debian/mlib-dev/usr/lib
+	mv debian/mlib2/usr/lib/*.la debian/mlib-dev/usr/lib
+	mv debian/mlib2/usr/include debian/mlib-dev/usr
 	dh_strip -a
 
 binary-indep:
@@ -33,10 +35,11 @@ binary-indep:
 binary-arch: install
 	dh_testdir -a
 	dh_testroot -a
-	dh_makeshlibs -a
+	dh_makeshlibs -a -V
 	dh_installman -a
 	dh_compress -a
 	dh_installdocs -a
+	dh_strip -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_fixperms -a
-- 
[mdw]