[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.dfsg-1-202-gec36f88

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit bf5b0fdda4782dfb56a82fdf9379d4fe6fc2dc0b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 30 17:33:08 2009 +0100

    Treat upstream double-digit minor version as minor.micro, to not need epoch if upstream later release a 6.10 version.

diff --git a/debian/changelog b/debian/changelog
index 097981b..d75e9fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-awstats (6.95~dfsg-1) UNRELEASED; urgency=low
+awstats (6.9.5~dfsg-1) UNRELEASED; urgency=low
 
   [ Sergey B Kirpichev ]
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index d69cd6e..8868567 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ include debian/cdbs/1/rules/copyright-check.mk
 include debian/cdbs/1/rules/upstream-tarball.mk
 
 DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/awstats
+DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/(-6\.9)\.(\d)/$$1$$2/
 DEB_UPSTREAM_TARBALL_MD5 = 26a5b19fa9f395e9e7dafed37b795d7f
 
 DEB_UPSTREAM_REPACKAGE_EXCLUDE = wwwroot/icon/browser/firefox.png
diff --git a/debian/watch b/debian/watch
index 1fb90ec..908408c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,5 +2,5 @@
 # (use get-orig-source build target to get source - see README.source)
 version=3
 # use qa.debian.org redirector; see man uscan
-opts=dversionmangle=s/.dfsg// \
+opts=dversionmangle=s/.dfsg//,uversionmangle=s/6\.9(\d)/6.9.$1/ \
   http://sf.net/awstats/awstats-(.*).tar.gz debian svn-upgrade

-- 
awstats Debian packaging