From 471f9daa24ee9251730e234fe92ad65c1fa9dff3 Mon Sep 17 00:00:00 2001 From: mdw Date: Mon, 10 Nov 2003 10:01:39 +0000 Subject: [PATCH] Various Debian fixes. --- Makefile.am | 8 ++++++-- debian/control | 4 ++-- debian/rules | 11 +++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 54a7a52..2c90910 100644 --- 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 68fe492..d4a4590 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: mlib Section: libs Priority: extra -Maintainer : Mark Wooding +Maintainer: Mark Wooding 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 1d58528..bf46ff2 100755 --- 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 -- 2.11.0