Uncomment and fix the watch rules for pre-releases and always scan for

both regular releases and prereleases.

diff --git a/debian/changelog b/debian/changelog
index 2e67f8fb35231d02e36aab45bdd331cba90b6116..7f7c6fb4c15d8da2133b23a922491a13ec9787a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ openafs (1.4.7~pre1.dfsg1-1) UNRELEASED; urgency=low
     - Depend on $(QUILT_STAMPFN) instead of patch.
     - Use touch $@ to create stamp files.
     - Use a stamp file for the module's install target.
+  * Uncomment and fix the watch rules for pre-releases and always scan for
+    both regular releases and prereleases.
 
  -- Russ Allbery <rra@debian.org>  Mon, 03 Mar 2008 18:49:17 -0800
 

diff --git a/debian/watch b/debian/watch
index f15eadd1866753355d3c38956ac4e7a306791b78..fbd187cd08f491b88214ab324babc626b4f899f4 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -13,5 +13,5 @@ opts=dversionmangle=s/\.dfsg\d+$// \
 
 # Release candidates are stashed in another secret place and we change the
 # version number for proper sorting of versions in Debian.
-#opts="uversionmangle=s/-rc/~rc/ dversionmangle=s/\.dfsg\d+$//" \
-#    http://dl.openafs.org/dl/openafs/candidate/ ([^/]+-rc\d+)/
+opts="uversionmangle=s/-rc/~rc/;s/pre/~pre/,dversionmangle=s/\.dfsg\d+$//" \
+    http://dl.openafs.org/dl/openafs/candidate/ ([^/]+-?(?:rc|pre)\d+)/