Debianization fixes.

diff --git a/configure.in b/configure.in
index 3cafccc0a3be71cc13e3bec336842a6b8275a1c7..53dae3b8914ccda5e53ac152d0414e45175d16a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl -*-fundamental-*-
+dnl -*-m4-*-

 dnl
 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
 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 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
 dnl Revision 1.35  2003/11/29 11:59:17  mdw
 dnl Various stuff.
 dnl

diff --git a/debian/.cvsignore b/debian/.cvsignore
index 9af7faf343d2545f467646bc66be6eeaa3325143..3243fc7db35b36de0ff9b62ed65f8ab458283db7 100644 (file)
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1 +1,4 @@
 files mlib-dev tmp substvars *.debhelper
 files mlib-dev tmp substvars *.debhelper

+mlib
+*.substvars
+mlib2

diff --git a/debian/control b/debian/control
index d4a4590fc5240e5efaea8947219d5260620e434e..0593f08b0dfc7ef54a0a7ffca4555b33a2ea4af0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,17 @@ Source: mlib
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@nsict.org>
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@nsict.org>

+Build-Depends: debhelper (>= 4.0.2)

 Standards-Version: 3.1.1
 
 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
 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.
 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 bf46ff24988c6b83edd5f8fd534f3a431c1a1041..83ea3610a436deb20cabcf8a458ab53b9ab23af1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #! /usr/bin/make -f
 
 #! /usr/bin/make -f
 

+export DH_COMPAT = 4
+

 build:
        rm -rf deb-build build; mkdir deb-build
        cd deb-build; ../configure \
 build:
        rm -rf deb-build build; mkdir deb-build
        cd deb-build; ../configure \


@@ -16,16 +18,16 @@ clean:
 
 install: build
        dh_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
        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:
        dh_strip -a
 
 binary-indep:


@@ -33,10 +35,11 @@ binary-indep:
 binary-arch: install
        dh_testdir -a
        dh_testroot -a
 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_installman -a
        dh_compress -a
        dh_installdocs -a

+       dh_strip -a

        dh_shlibdeps -a
        dh_gencontrol -a
        dh_fixperms -a
        dh_shlibdeps -a
        dh_gencontrol -a
        dh_fixperms -a