From a7f5705d7a41300898187a83b06cbf3fc85684fb Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 29 Nov 2003 23:49:42 +0000 Subject: [PATCH] Debianization fixes. Organization: Straylight/Edgeware From: mdw --- configure.in | 7 +++++-- debian/.cvsignore | 2 ++ debian/control | 5 +++-- debian/rules | 17 ++++++++++------- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index 51ba460..39b5802 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ -dnl -*-fundamental-*- +dnl -*-m4-*- dnl -dnl $Id: configure.in,v 1.10 2002/01/13 14:32:33 mdw Exp $ +dnl $Id: configure.in,v 1.11 2003/11/29 23:45:03 mdw Exp $ dnl dnl Configuration script for mgLib dnl @@ -29,6 +29,9 @@ dnl MA 02111-1307, USA. dnl ----- Revision history -------------------------------------------------- dnl dnl $Log: configure.in,v $ +dnl Revision 1.11 2003/11/29 23:45:03 mdw +dnl Debianization fixes. +dnl dnl Revision 1.10 2002/01/13 14:32:33 mdw dnl Use the correct compiler flags. Maybe. dnl diff --git a/debian/.cvsignore b/debian/.cvsignore index 6803268..617ccd8 100644 --- a/debian/.cvsignore +++ b/debian/.cvsignore @@ -1,2 +1,4 @@ files tmp substvars *.substvars *.debhelper mglib-dev +mglib +mglib1 diff --git a/debian/control b/debian/control index e5e6984..ed5605c 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,18 @@ Source: mglib Section: x11 Priority: extra +Build-Depends: mlib-dev (>= 2.0.0), debhelper (>= 4.0.2) Maintainer: Mark Wooding Standards-Version: 3.1.1 -Package: mglib +Package: mglib1 Architecture: any Depends: ${shlibs:Depends} Description: A library of miscellaneous GTK+ stuff Package: mglib-dev Architecture: any -Depends: mglib (= ${Source-Version}), mlib-dev (>= 2.0.0), libgtk1.2-dev, xlibs-dev +Depends: mglib1 (= ${Source-Version}), mlib-dev (>= 2.0.0), libgtk1.2-dev, xlibs-dev Description: A library of miscellaneous GTK+ stuff This package contains the header files and static libraries needed to compile programs which use mgLib. diff --git a/debian/rules b/debian/rules index 8abd163..64e7b65 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 \ @@ -15,13 +17,13 @@ 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/mglib1 mkdir -p debian/mglib-dev/usr/lib - mv debian/tmp/usr/bin debian/mglib-dev/usr/bin - mv debian/tmp/usr/lib/*.a debian/mglib-dev/usr/lib - mv debian/tmp/usr/lib/*.so debian/mglib-dev/usr/lib - mv debian/tmp/usr/include debian/mglib-dev/usr + mv debian/mglib1/usr/bin debian/mglib-dev/usr/bin + mv debian/mglib1/usr/lib/*.a debian/mglib-dev/usr/lib + mv debian/mglib1/usr/lib/*.so debian/mglib-dev/usr/lib + mv debian/mglib1/usr/lib/*.la debian/mglib-dev/usr/lib + mv debian/mglib1/usr/include debian/mglib-dev/usr dh_strip -a binary-indep: @@ -29,9 +31,10 @@ binary-indep: binary-arch: install dh_testdir -a dh_testroot -a - dh_makeshlibs -a + dh_makeshlibs -a -V dh_compress -a dh_installdocs -a + dh_strip -a dh_shlibdeps -a dh_gencontrol -a dh_fixperms -a -- [mdw]