From ca4dfd446d6d8a9f73b9dc090a674b8398b74f06 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Wed, 4 Jun 2003 02:47:15 +0000
Subject: [PATCH] packaging fixes

---
 debian/changelog |  6 ++++++
 debian/control   |  9 +++++++++
 debian/rules     | 29 ++++++++++-------------------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efee42e..5ceb521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+comedilib (0.7.18-cvs20020912) unstable; urgency=low
+
+  * snapshot
+
+ -- David Schleef <ds@schleef.org>  Thu, 12 Sep 2002 16:43:08 -0700
+
 comedilib (0.7.18) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 01faf51..0076060 100644
--- a/debian/control
+++ b/debian/control
@@ -20,3 +20,12 @@ 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.
+
+Package: python-comedilib
+Section: python
+Architecture: any
+Depends: makedev (>=2.3.1-56), ${shlibs:Depends}
+Description: Python wrapper for Comedilib
+ Comedilib is a library for using Comedi, a driver interface for data
+ acquisition hardware.
+
diff --git a/debian/rules b/debian/rules
index 79c6acf..8f01176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,19 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=1
+export DH_COMPAT=3
 
-# shared library versions, option 1
-include version
-major=0
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr
+	./configure --prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--datadir=\$${prefix}/share/doc/ \
+		--sysconfdir=/etc \
+		--disable-dependency-tracking
+
 	$(MAKE)
 
 	touch build-stamp
@@ -36,14 +38,11 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install prefix=`pwd`/debian/tmp/usr
-
+	$(MAKE) install prefix=`pwd`/debian/tmp/usr \
+		pkgdatadir=`pwd`/debian/tmp/usr/share/doc/libcomedi-dev
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 #	dh_testversion
 	dh_testdir
@@ -51,12 +50,7 @@ binary-arch: build install
 	#
 	# build libcomedi${major} package by moving files from comedilib-dev
 	#
-	dh_movefiles -plibcomedi$(major)		\
-		usr/lib/libcomedi.so.$(version)		\
-		usr/lib/libcomedi.so.$(major)		\
-		usr/sbin/comedi_config			\
-		usr/bin/comedi_calibrate		\
-		etc
+	dh_movefiles
 
 #	dh_installdebconf	
 	dh_installdocs
@@ -66,9 +60,6 @@ binary-arch: build install
 #	dh_installpam
 #	dh_installinit
 	dh_installcron
-	dh_installmanpages -plibcomedi0
-
-	(cd debian/tmp/usr/share && rm -rf man)
 
 	dh_installinfo
 #	dh_undocumented
-- 
2.26.2