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

[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 timblserver.

commit 1bef74f22438bb5acdb3fd3112be58fe6a4e16c8
Merge: 0a7a76b e33c208
Author: proycon <proycon at anaproy.nl>
Date:   Thu Aug 4 00:05:34 2016 +0200

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/timblserver

 debian/changelog | 1 +
 debian/watch     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 76dd389,1622d88..a074520
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,12 @@@
  timblserver (1.8-1.2) UNRELEASED; urgency=medium
  
    * Website URL
+   * debian/watch: updated to point to github (v1.10 ready there)
 +  * debian/watch: updated to point to github (make dist tarballs)
 +  * debian/copyright: upstream source link + bumped dates  
 +  * preparing for new upstream
  
 - -- Maarten van Gompel <proycon at anaproy.nl>  Thu, 04 Feb 2016 19:05:16 +0100
 + -- Maarten van Gompel <proycon at anaproy.nl>  Fri, 05 Aug 2016 10:12:16 +0200
  
  timblserver (1.8-1.1) unstable; urgency=medium
  
diff --cc debian/watch
index 618ab1e,e3e7243..db8d1a8
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,6 +1,6 @@@
+ # git://anonscm.debian.org/debian-science/packages/libticcutils.git
+ 
  # See uscan(1) for format
- # ssh+git://git.debian.org/git/debian-science/packages/timblserver.git
+ 
  version=3
 -https://github.com/LanguageMachines/timblserver/releases /LanguageMachines/timblserver/archive/v(.+)\.tar\.gz
 +https://github.com/LanguageMachines/timblserver/releases /LanguageMachines/timblserver/releases/download/v(.+)/timblserver-(?:.+)\.tar\.gz

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