From 3770278066c365d60440c1e92077bb414f5428f2 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 16 Aug 2003 00:42:41 +0000 Subject: [PATCH] updates from debian package --- debian/changelog | 27 +++++++++++++++++++++------ debian/control | 23 ++++++++++++++++++++--- debian/libcomedi0.postinst | 13 +++++++------ debian/libcomedi0.postrm | 4 ---- debian/libcomedi0.shlibs | 2 +- debian/rules | 14 +++++++++++++- 6 files changed, 62 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index c018f1b..b539b29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,29 @@ -comedilib (0.7.19.1-2) unstable; urgency=low +comedilib (0.7.20-2) unstable; urgency=low - * snapshot + * Apparently debian/copyright got broken at some point in time. + (probably forgot to merge code back into CVS). Fixed now, + but not merged into CVS. :) + * Bumped shlibs, since there were symbols added to the lib. + * Updated to policy 3.5.10: + - Handle DEB_BUILD_OPTIONS + - Fix creation of device nodes + * Long overdue rewrite of package descriptions - -- David Schleef Thu, 05 Jun 2003 12:55:03 -0700 + -- David Schleef Wed, 25 Jun 2003 10:18:09 -0700 -comedilib (0.7.18-cvs20020912) unstable; urgency=low +comedilib (0.7.20-1) unstable; urgency=low - * snapshot + * New upstream release + * Convert to using autoconf/automake, which takes care of problems + with gcc-3.x (Closes: #194885) - -- David Schleef Thu, 12 Sep 2002 16:43:08 -0700 + -- David Schleef Tue, 17 Jun 2003 16:18:25 -0700 + +comedilib (0.7.19-1) unstable; urgency=low + + * New upstream release + + -- David Schleef Wed, 3 Jul 2002 21:04:37 -0700 comedilib (0.7.18) unstable; urgency=low diff --git a/debian/control b/debian/control index 00e2a1f..b984476 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: David Schleef Build-Depends: debhelper, python-dev, docbook-utils -Standards-Version: 3.5.6 +Standards-Version: 3.5.10 Package: libcomedi-dev Section: libdevel @@ -14,6 +14,11 @@ Replaces: libcomedi0 (<= 0.7.19.1-1) Description: Development library for Comedi Comedilib is a library for using Comedi, a driver interface for data acquisition hardware. + . + This package contains headers, static libraries, documentation, and + examples for writing software that uses the Comedilib library. You + only need to install it if you plan to develop or compile software + that uses Comedilib. Package: libcomedi0 Section: libs @@ -21,7 +26,19 @@ Architecture: any Depends: makedev (>=2.3.1-56), ${shlibs:Depends} Description: Library for Comedi Comedilib is a library for using Comedi, a driver interface for data - acquisition hardware. + acquisition hardware. Comedi supports a wide variety of ISA and PCI + devices that contain analog-to-digital converters, digital-to-analog + converters, digital input/output, counters and timers. The full list + of support devices can be found in the libcomedi-dev documentation. + . + This package contains the shared library component of Comedilib. In + general, this package will be automatically installed as a dependency + of application or other library packages. + . + In order to effectively use this package, you need to have compiled + and installed the Comedi kernel modules. The source for Comedi is + available in the comedi-source package, which also contains + instructions on how to compile and install the modules. Package: python-comedilib Section: python @@ -29,5 +46,5 @@ Architecture: any Depends: ${shlibs:Depends} Description: Python wrapper for Comedilib Comedilib is a library for using Comedi, a driver interface for data - acquisition hardware. + acquisition hardware. See the libcomedi0 package for more information. diff --git a/debian/libcomedi0.postinst b/debian/libcomedi0.postinst index 460c4cb..b7672dc 100644 --- a/debian/libcomedi0.postinst +++ b/debian/libcomedi0.postinst @@ -1,12 +1,13 @@ #!/bin/sh -# Policy says that the user should be asked before we do this. -cd /dev && MAKEDEV comedi - -#DEBHELPER# - if [ "$1" = "configure" ]; then - ldconfig + if [ ! -e "/dev/comedi0" ];then + echo "Creating /dev/comediN device nodes" + cd /dev && MAKEDEV comedi + fi fi +#DEBHELPER# + exit 0 + diff --git a/debian/libcomedi0.postrm b/debian/libcomedi0.postrm index e801838..42faf6a 100644 --- a/debian/libcomedi0.postrm +++ b/debian/libcomedi0.postrm @@ -2,8 +2,4 @@ #DEBHELPER# -if [ "$1" = "remove" ]; then - ldconfig -fi - exit 0 diff --git a/debian/libcomedi0.shlibs b/debian/libcomedi0.shlibs index 4f46acf..260cae7 100644 --- a/debian/libcomedi0.shlibs +++ b/debian/libcomedi0.shlibs @@ -1 +1 @@ -libcomedi 0 libcomedi0 (>> 0.7.16) +libcomedi 0 libcomedi0 (>= 0.7.19) diff --git a/debian/rules b/debian/rules index 8f01176..50fdf25 100755 --- a/debian/rules +++ b/debian/rules @@ -8,12 +8,24 @@ # This is the debhelper compatability version to use. export DH_COMPAT=3 +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif build: build-stamp build-stamp: dh_testdir - ./configure --prefix=/usr \ + ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ --mandir=\$${prefix}/share/man \ --datadir=\$${prefix}/share/doc/ \ --sysconfdir=/etc \ -- 2.26.2