[ucto] 02/02: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ucto

[Maarten van Gompel]

This is an automated email from the git hooks/post-receive script.

proycon-guest pushed a commit to branch master
in repository ucto.

commit 8ba6909a053b6660e060c479de06a6df1969d36e
Merge: 01d7a5c 775bd0e
Author: Maarten van Gompel <proycon at anaproy.nl>
Date:   Tue Feb 9 23:13:10 2016 +0100

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ucto
    
    Conflicts:
    	debian/changelog

 debian/TODO      |  8 --------
 debian/changelog | 26 +++++++++++++++++---------
 debian/control   |  2 ++
 debian/watch     |  4 ----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index 380e577,d4a472b..6c6708a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,11 +1,15 @@@
- ucto (0.8.0-2) UNRELEASED; urgency=medium
+ ucto (0.8.0-3) UNRELEASED; urgency=medium
  
 +  [ Joost van Baal-Ilić ]
    * UNRELEASED
+   * debian/TODO: obsolete, removed.
+ 
++  [ Maarten van Gompel ]
++  * debian/watch:  pointing to github releases now
++
+  -- Joost van Baal-Ilić <joostvb at debian.org>  Sat, 06 Feb 2016 03:39:00 +0100
+ 
+ ucto (0.8.0-2) unstable; urgency=medium
  
    * debian/control, debian/copyright: Upstream has moved from Tilburg to
      Nijmegen: Homepage moved from http://ilk.uvt.nl/ucto/ to
diff --cc debian/watch
index 5bb3b66,080397c..9abb352
--- a/debian/watch
+++ b/debian/watch
@@@ -3,8 -4,4 +3,4 @@@
  # See uscan(1) for format
  
  version=3
 -http://software.ticc.uvt.nl/ucto-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
 +https://github.com/LanguageMachines/ucto/releases /LanguageMachines/ucto/archive/v(.+)\.tar\.gz
- 
- #version=3
- #opts=filenamemangle=s%.+\/v?(\d\S*)\.tar\.gz%ticcutils-$1\.tar\.gz% \
- #  https://github.com/LanguageMachines/ticcutils/releases .*/v?(\d\S*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ucto.git