Clarify comment and add changelog entries for module builds

diff --git a/debian/changelog b/debian/changelog
index 4db99fd84c068c0f499f23677caf6592636e346d..0cab2263ddcbc46ba79926a3c194d9ffc0b407a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+openafs (1.6.2~pre3-2) UNRELEASED; urgency=low
+
+  * Avoid re-running setup after build when building modules from the
+    openafs-modules-source package with module-assistant.  This will
+    hopefully avoid an issue where, following an upgrade of
+    openafs-modules-source, module-assistant cannot build new module
+    packages without an intervening module-assistant clean.  Patch from
+    Thorsten Alteholz.  (Closes: #660622)
+  * Make another attempt at suppressing the wildcard action for building
+    debian/rules to fix problems building module packages using
+    make-kpkg.  Patch from Thorsten Alteholz.  (Closes: #639475)
+
+ -- Russ Allbery <rra@debian.org>  Sat, 09 Feb 2013 14:50:39 -0800
+
 openafs (1.6.2~pre3-1) experimental; urgency=low
 
   * New upstream prerelease.

diff --git a/debian/module/rules b/debian/module/rules
index 38c8235603c3926d74f51f60a975cce154f58bd5..10537885518838b44632554d947ed424f37271e7 100755 (executable)
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -29,23 +29,27 @@ package    = openafs
 modulepkg := openafs-modules-$(KVERS)${INT_SUBARCH}
 moduledir := debian/$(modulepkg)/lib/modules/$(KVERS)/fs
 
-# After building the package m-a calls debian/rules with target 
-# 'echo-debfile'. As this triggers the setup:-target, the flag-file '
-# setup' will be created again. 
-# In following builds m-a might unpack the original tar-file again
-# and thus overwrites the debian/control file. As the original file 
-# does not contain any binary package definition and due to the still 
-# available file 'setup', no rebuild happens and an error appears 
-# (dh: "No packages to build.")
-# In case of changes to m-a more dummy target must be added here.
-# (the target may not be empty!)
+# After building the package, m-a calls debian/rules with the target
+# echo-debfile.  Without this dummy rule, this would trigger the setup
+# target (by way of the wildcard rule for dh), which re-creates the setup
+# flag file that we removed during make clean.
+#
+# Then, if module-assistant unpacks a new version of the source, the setup
+# file already exists so the setup rule isn't run again.  But the
+# debian/control file is the template from the new source, which doesn't
+# contain any buildable packages.
+#
+# Add a dummy target for echo-debfile to ensure that setup isn't run again
+# after clean.  If there are further changes to module-assistant, causing it
+# to run other targets after clean, more similar dummy rules may need to be
+# added.
 echo-debfile:
-       echo "dummy target: echo-debfile"
+       @true
 
 # make-kpkg tries to rebuild debian/rules first, so add a dummy target to
 # avoid our dh wildcard rule and a fatal error.
 debian/rules ./debian/rules:
-       echo "dummy target: debian/rules"
+       @true
 
 # This setup must be done before running any other target if it hasn't
 # already been done.