Update watch file for +dfsg naming

diff --git a/debian/changelog b/debian/changelog
index f66bfb3d0d8c44ce66ad16576361d7067324e2ca..6043399d7336248aacab742eae72cfe6a52d7068 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openafs (1.4.9~pre2+dfsg1-1) UNRELEASED; urgency=low
 
   * New upstream testing release.
+    - Use +dfsg instead of .dfsg for saner version sorting.
+  * Update debian/watch for +dfsg naming instead of .dfsg.
   * Translation updates:
     - Japanese, thanks Hideki Yamane.  (Closes: #521518)
 

diff --git a/debian/watch b/debian/watch
index fbd187cd08f491b88214ab324babc626b4f899f4..e5ed849e0df1fe5210e6c07b84a2229588012535 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
-# debian/watch -- Rules for uscan to find new upstream versions.
-#
 # Note that the following watch file does not find development releases,
 # only general releases and release candidates.  If we package development
 # releases, a rule should be added to find them as well.
@@ -7,11 +5,11 @@
 version=3
 
 # Without the /pages in the URL, one gets the frameset page.
-opts=dversionmangle=s/\.dfsg\d+$// \
+opts=dversionmangle=s/[\.+]dfsg\d+$// \
     http://www.openafs.org/pages/release/latest.html \
         .*/openafs-([^-]+)-src\.tar\.gz
 
 # 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/;s/pre/~pre/,dversionmangle=s/\.dfsg\d+$//" \
+opts="uversionmangle=s/-rc/~rc/;s/pre/~pre/,dversionmangle=s/[\.+]dfsg\d+$//" \
     http://dl.openafs.org/dl/openafs/candidate/ ([^/]+-?(?:rc|pre)\d+)/