Various Debian fixes.

diff --git a/Makefile.am b/Makefile.am
index 54a7a52c5aa48077d5a06d3ea7ae58e60438246e..2c9091088926b633ba774e0e0f92dd667091fd55 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.39 2003/11/09 13:48:43 mdw Exp $
+## $Id: Makefile.am,v 1.40 2003/11/10 10:01:14 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.40  2003/11/10 10:01:14  mdw
+## Various Debian fixes.
+##
 ## Revision 1.39  2003/11/09 13:48:43  mdw
 ## Debianization\!
 ##
@@ -286,7 +289,8 @@ uninstall-man:
 
 CLEANFILES = $(TEST_CLEAN) crc32-tab.c
 DISTCLEANFILES = libtool
-EXTRA_DIST = $(TEST_DIST) maninst \
+EXTRA_DIST = \
+       $(TEST_DIST) maninst \
        debian/rules debian/copyright debian/control debian/changelog
 
 ##----- That's all, folks ---------------------------------------------------

diff --git a/debian/control b/debian/control
index 68fe49253616fdc101837143cb8f5392b060a42a..d4a4590fc5240e5efaea8947219d5260620e434e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: mlib
 Section: libs
 Priority: extra
-Maintainer : Mark Wooding
+Maintainer: Mark Wooding <mdw@nsict.org>
 Standards-Version: 3.1.1
 
 Package: mlib
@@ -11,7 +11,7 @@ Description: A library of miscellaneous stuff
 
 Package: mlib-dev
 Architecture: any
-Depends: mlib (= 2.0.2), libc6-dev
+Depends: mlib (= ${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 1d5852830378a6b64e59d0c7b49bb30fc06ff1fb..bf46ff24988c6b83edd5f8fd534f3a431c1a1041 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,10 @@ install: build
        dh_clean
        make -C deb-build install DESTDIR=`pwd`/debian/tmp
        rm -f debian/tmp/usr/lib/*.la
-       mkdir -p debian/mlib-dev/usr/lib debian/mlib-dev/usr/share/man
+       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
@@ -31,12 +34,12 @@ binary-arch: install
        dh_testdir -a
        dh_testroot -a
        dh_makeshlibs -a
-       dh_fixperms -a
        dh_installman -a
        dh_compress -a
        dh_installdocs -a
        dh_shlibdeps -a
        dh_gencontrol -a
+       dh_fixperms -a
        dh_installdeb -a
        dh_md5sums -a
        dh_builddeb -a
@@ -48,7 +51,7 @@ source:
        make -C deb-build dist PACKAGE=mlib
        mkdir deb-build/=deb=
        cd deb-build/=deb=; tar xvfz ../*.tar.gz
-       cd ..; dpkg-source -i -b mLib/deb-build/=deb=/*
+       d=`pwd`; cd ..; dpkg-source -i -b $$d/deb-build/=deb=/*
        rm -rf deb-build/=deb=
 
-.PHONY: binary binary-arch binary-indep clean install
+.PHONY: binary binary-arch binary-indep clean install source