[Glibc-bsd-commits] r6178 - trunk/freebsd-manpages/debian

[abe at alioth.debian.org]

Author: abe
Date: 2017-11-14 04:54:17 +0000 (Tue, 14 Nov 2017)
New Revision: 6178

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/watch
Log:
freebsd-manpages: Fix debian/watch: Use uversionmangle instead of look-behind patterns

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2017-11-14 01:10:19 UTC (rev 6177)
+++ trunk/freebsd-manpages/debian/changelog	2017-11-14 04:54:17 UTC (rev 6178)
@@ -6,6 +6,9 @@
   * Set "Rules-Requires-Root: no".
   * Bump debhelper compatibility to 10.
     + Update versioned debhelper build-dependency accordingly.
+  * Fix debian/watch file: Newer uscan versions seem to append an implicit
+    "$" at the end of the pattern, causing patterns with look-behind
+    patterns (?=…) to no more work as expected.
 
  -- Axel Beckert <abe at debian.org>  Mon, 13 Nov 2017 04:13:23 +0100
 

Modified: trunk/freebsd-manpages/debian/watch
===================================================================
--- trunk/freebsd-manpages/debian/watch	2017-11-14 01:10:19 UTC (rev 6177)
+++ trunk/freebsd-manpages/debian/watch	2017-11-14 04:54:17 UTC (rev 6178)
@@ -1,7 +1,7 @@
-version=3
+version=4
 
 # Fake download which points to a directory. uscan's downloadurlmangle
 # doesn't seem to work with FTP while directory links with trailing
 # slash don't seem to work with HTTP. *sigh*
-opts=uversionmangle=s/-(RC|BETA)/~$1/ \
-http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+(?:(?:-RC\d*|-BETA\d*)(?=/)|(?=-RELEASE/)))
+opts=uversionmangle=s/-(RC|BETA)/~$1/;s/-RELEASE// \
+http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+(?:(?:-RC\d*|-BETA\d*)/|-RELEASE/))