Seems to work now

diff --git a/debian/comedi-modules.control b/debian/comedi-modules.control
index e2d924d9501a50bfc6f15ff32f3d2363b8c57b97..85ae055cac5a3d5d4590a104762e50bce2de2efb 100644 (file)
--- a/debian/comedi-modules.control
+++ b/debian/comedi-modules.control
@@ -1,4 +1,10 @@
-Package: comedi-modules-${kvers}
+Source: comedi
+Priority: optional
+Maintainer: David Schleef <ds@schleef.org>
+Build-Depends: debhelper (>> 2.0.0)
+Standards-Version: 3.5.6
+
+Package: comedi-modules-$KVERS
 Section: admin
 Architecture: any
 Description: Comedi modules

diff --git a/debian/comedi.templates b/debian/comedi.templates
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/debian/comedi.templates
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/debian/files b/debian/files
deleted file mode 100644 (file)
index 60f5fe1..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-comedi-modules_0.7.63-cvs20020210-1_i386.deb admin optional

diff --git a/debian/genchanges.sh b/debian/genchanges.sh
deleted file mode 100644 (file)
index 5199dfa..0000000
--- a/debian/genchanges.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# genchanges.sh - generate a changes file for a deb file generated via
-#      the make-kpkg utility
-
-# KSRC KMAINT and KEMAIL are expected to be passed through the environment
-
-set -e
-umask 022
-
-KVERS=`cat debian/KVERS`
-MODVERS=`cat debian/MODVERS`
-ARCH=`dpkg --print-architecture`
-
-# determine the maintainer's name
-for name in "$KMAINT" "$DEBFULLNAME" "$DEBNAME"
-do test -n "$name" && break; done
-for email in "$KEMAIL" "$DEBEMAIL"
-do test -n "$email" && break; done
-if [ "$name" -a "$email" ]; then maint="$name <$email>"
-elif [ "$email" ]; then maint="$email"
-else maint=""; fi
-    
-dpkg-genchanges -b ${maint:+-e"$maint"} -u"$KSRC/.." \
-
-# the changes file's name
-chfile="$KSRC/../pcmcia-modules-${KVERS}_${MODVERS}_${ARCH}.changes"
-
-dpkg-genchanges -b ${KMAINT:+-e"$maint"} -u"$KSRC/.." \
-       -cdebian/control.tmp > "$chfile.pt"
-if test -e "${GNUPGHOME:-$HOME/.gnupg/secring.gpg}"; then
-    gpg -ast ${email:+-u"$email"} \
-       --clearsign < "$chfile.pt" > "$chfile"
-else
-    pgp -fast ${email:+-u"$email"} +clearsig=on \
-       < "$chfile.pt" > "$chfile"
-fi
-rm "$chfile.pt"

diff --git a/debian/rules b/debian/rules
index 0dd338b802aabd922248d00ab9bb56aae060f0d6..ffc14404b2d3dcfd314dfb4e6fb1d9378fac9a55 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,11 @@
 # architecture-dependant package, as well as an architecture-independent
 # package.
 
-#p_mod=comedi-modules-$(KVERS)
-p_mod=comedi-modules
+p_mod=comedi-modules-$(KVERS)
+#p_mod=comedi-modules
 d_mod=debian/$(p_mod)
 
+.PHONY: kdist_image
 kdist_image:   checkroot
        $(RM) debian/files
        yes "" | ./configure --linuxdir $(KSRC) --non-interactive --reconf
@@ -27,27 +28,28 @@ kdist_image:        checkroot
          $(d_mod)/usr/share/doc/$(p_mod)/copyright
        chown -R root.root $(d_mod)
        chmod -R g-ws $(d_mod)
+       echo "kpkg:Package-Version=$(epoch)$(pversion)+$(non_epoch_version)" \
+         >> debian/substvars
+       echo "kpkg:Kernel-Version=$(KVERS)" >> debian/substvars
+       sed 's/\$$KVERS/$(KVERS)/' debian/comedi-modules.control >debian/control
        dpkg-gencontrol -p$(p_mod) -P$(d_mod) -isp
        dpkg-deb --build $(d_mod) $(KSRC)/..
 
-kdist_changes:
-
-kdist_configure:
+.PHONY: kdist_config
+kdist_config:
+       echo "****** kdist_configure *****"
+       env
+       yes "" | ./configure --linuxdir $(KSRC) --non-interactive --reconf
        
-kdist: kdist_image
-       #$(RM) -r $(d_mod)
-
+.PHONY: kdist_clean clean
 kdist_clean clean:
        $(MAKE) distclean
        $(RM) -r debian/tmp $(d_mod) debian/src debian/*~ \
-         debian/files debian/control.tmp debian/substvars
+         debian/files debian/substvars
 
 build:
 
-clean-modules:
-       -umask 022; $(MAKE) DEB_MOD=yes clean
-       $(RM) build-modules
-
+.PHONY: binary-source
 binary-source: checkroot
        $(RM) -r debian/src
        install -d debian/src debian/src/DEBIAN
@@ -81,13 +83,15 @@ binary-source: checkroot
        dpkg-gencontrol -pcomedi-source -Pdebian/src -isp
        dpkg-deb --build debian/src ..
 
+.PHONY: binary-arch
 binary-arch:
 
+.PHONY: binary-indep
 binary-indep: binary-source
 
 checkroot:
        test root = "`whoami`"
 
+.PHONY: binary
 binary: binary-indep
 
-.PHONY: build clean binary-indep binary-arch binary install configure