From: Russ Allbery <rra@debian.org>
Date: Wed, 1 Apr 2009 01:30:05 +0000 (-0700)
Subject: Update watch file for +dfsg naming
X-Git-Tag: debian/1.4.10+dfsg1-1~34
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=99fd8d340fbddcfcbe876c68d440c38b5b8137bf;p=packages%2Fo%2Fopenafs.git

Update watch file for +dfsg naming
---

diff --git a/debian/changelog b/debian/changelog
index f66bfb3d0..6043399d7 100644
--- 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 fbd187cd0..e5ed849e0 100644
--- 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+)/