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

[abe at alioth.debian.org]

Author: abe
Date: 2016-10-19 22:30:50 +0000 (Wed, 19 Oct 2016)
New Revision: 6122

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/watch
Log:
Reduce debian/watch to use a single line for releases and betas

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2016-10-19 22:25:28 UTC (rev 6121)
+++ trunk/freebsd-manpages/debian/changelog	2016-10-19 22:30:50 UTC (rev 6122)
@@ -4,6 +4,7 @@
   * Update Gürkan's family name.
   * Add debian/README.source: Document importing a new upstream version.
   * Set "Multi-Arch: foreign" as suggested by the Multi-Arch hinter.
+  * Reduce debian/watch to use a single line for releases and betas.
 
  -- Axel Beckert <abe at debian.org>  Wed, 19 Oct 2016 00:42:25 +0200
 

Modified: trunk/freebsd-manpages/debian/watch
===================================================================
--- trunk/freebsd-manpages/debian/watch	2016-10-19 22:25:28 UTC (rev 6121)
+++ trunk/freebsd-manpages/debian/watch	2016-10-19 22:30:50 UTC (rev 6122)
@@ -3,10 +3,5 @@
 # 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*
-http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+)-RELEASE/
-
-# Betas and RC versions
-opts=uversionmangle=s/-/~/ \
-http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+-BETA\d*)/
-opts=uversionmangle=s/-/~/ \
-http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+-RC\d*)/
+opts=uversionmangle=s/-(RC|BETA)/~$1/ \
+http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+)-(?:RELEASE|RC\d*|BETA\d*)/