[SCM] cantata/master: Change URLs from google code to github

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 35ea1812bcff6aba84d05797d9864f1c1d4393d7
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed Nov 4 00:37:53 2015 +1100

    Change URLs from google code to github

diff --git a/debian/control b/debian/control
index c15df70..7fbc0e5 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: cmake,
                pkg-config,
                pkg-kde-tools
 Standards-Version: 3.9.6
-Homepage: https://code.google.com/p/cantata/
+Homepage: https://github.com/CDrummond/cantata
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/cantata.git
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/cantata.git
 
diff --git a/debian/copyright b/debian/copyright
index fb59d65..59e2b4d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cantata
-Source: https://code.google.com/p/cantata/
+Source: https://github.com/CDrummond/cantata
 Files-Excluded:
     3rdparty/ebur128
     3rdparty/qjson
diff --git a/debian/watch b/debian/watch
index 7182b25..3cfb609 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,5 +3,5 @@
 # download URL will return a 404 and uscan will stop.
 #
 version=3
-opts=uversionmangle=s#/##g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,dversionmangle=s/\.ds1//,downloadurlmangle=s/$/googlecode-makes-life-difficult/ \
- http://cantata.googlecode.com/svn/release/(\d+\.\d+\..*)
+opts=dversionmangle=s/\.ds1//,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/cantata-$1\.tar\.gz/ \
+  https://github.com/CDrummond/cantata/tags .*/v?(\d\S*)\.tar\.gz

-- 
cantata packaging