* Fix make kdist in openafs-modules-source, inadvertently broken by a

  missing genchanges script.

diff --git a/debian/changelog b/debian/changelog
index b60a753c8c18383a9b0bc113ce9675dfadd65553..b8f17262261a048c6799bb63c34c5143bf0c7cef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ openafs (1.4.5~pre2.dfsg1-1) UNRELEASED; urgency=low
   * Remove the workaround added for 2.6.20 and 2.6.21 kernels with
     CONFIG_PARAVIRT enabled.  The mistaken GPL-labelling of core
     interfaces was fixed in 2.6.22, which has now migrated to testing.
+  * Fix make kdist in openafs-modules-source, inadvertently broken by a
+    missing genchanges script.
 
- -- Russ Allbery <rra@debian.org>  Mon, 15 Oct 2007 23:24:40 -0700
+ -- Russ Allbery <rra@debian.org>  Mon, 15 Oct 2007 23:28:11 -0700
 
 openafs (1.4.4.dfsg1-7) unstable; urgency=low
 

diff --git a/debian/genchanges.sh b/debian/genchanges.sh
deleted file mode 100644 (file)
index e38781b..0000000
--- a/debian/genchanges.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# genchanges.sh - generate a changes file for a deb file generated via
-#      the make-kpkg utility
-
-# KSRC, KVERS, KMAINT, and KEMAIL are expected to be passed through the
-# environment.
-
-set -e
-umask 022
-
-MODVERS=`cat debian/VERSION | sed s/:/\+/`
-ARCH=`dpkg --print-architecture`
-
-mprefix=`grep Package: debian/control.module | cut -d' ' -f 2 | cut -d= -f 1`
-chfile="$KSRC/../$mprefix${KVERS}${INT_SUBARCH}_${MODVERS}_${ARCH}.changes"
-
-dpkg-genchanges -b ${KMAINT:+-m"$KMAINT <$KEMAIL>"} -u"$KSRC/.." \
-    -cdebian/control > "$chfile"
-#debsign "$chfile"

diff --git a/debian/module/genchanges b/debian/module/genchanges
new file mode 100644 (file)
index 0000000..e38781b
--- /dev/null
+++ b/debian/module/genchanges
@@ -0,0 +1,19 @@
+#!/bin/sh
+# genchanges.sh - generate a changes file for a deb file generated via
+#      the make-kpkg utility
+
+# KSRC, KVERS, KMAINT, and KEMAIL are expected to be passed through the
+# environment.
+
+set -e
+umask 022
+
+MODVERS=`cat debian/VERSION | sed s/:/\+/`
+ARCH=`dpkg --print-architecture`
+
+mprefix=`grep Package: debian/control.module | cut -d' ' -f 2 | cut -d= -f 1`
+chfile="$KSRC/../$mprefix${KVERS}${INT_SUBARCH}_${MODVERS}_${ARCH}.changes"
+
+dpkg-genchanges -b ${KMAINT:+-m"$KMAINT <$KEMAIL>"} -u"$KSRC/.." \
+    -cdebian/control > "$chfile"
+#debsign "$chfile"

diff --git a/debian/module/rules b/debian/module/rules
index 359b373fcd02562a89317f97d76f816638cb3d1e..620210da13ca0aecde7baa5285f847915c9e2420 100755 (executable)
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -115,7 +115,7 @@ kdist_image: build-arch-stamp
 kdist: build-arch-stamp
        $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary-arch
        KSRC="$(KSRC)" KMAINT="$(KMAINT)" KEMAIL="$(KEMAIL)" \
-           sh -v debian/genchanges.sh
+           sh -v debian/genchanges
        $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
 
 kdist_clean: