[med-svn] [fastaq] 03/03: Merged the previous commit with the new one

[Jorge Soares]

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

jssoares-guest pushed a commit to branch master
in repository fastaq.

commit d9724de0d2cfe779bd5941e71dbbacd093140ef8
Merge: 23d8b27 c9d4e7d
Author: Jorge Soares <j.s.soares at gmail.com>
Date:   Sun Feb 2 11:57:27 2014 +0000

    Merged the previous commit with the new one

 debian/control | 2 +-
 debian/watch   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc debian/control
index a3ab81c,5c3905e..81ca120
--- a/debian/control
+++ b/debian/control
@@@ -9,11 -9,11 +9,11 @@@ Build-Depends: debhelper (>= 9)
                 samtools
  	       asciidoc
  Standards-Version: 3.9.5
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/Fastaq.git
 -Vcs-Svn: git://anonscm.debian.org/debian-med/Fastaq.git
 -Homepage: https://github.com/sanger-pathogens/Fastaq
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/fastaq.git
 +Vcs-Svn: git://anonscm.debian.org/debian-med/fastaq.git
 +Homepage: https://github.com/js21/Fastaq
  
--Package: Fastaq
++Package: fastaq
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends},
diff --cc debian/watch
index 500f24f,432d77c..5317993
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,22 +1,4 @@@
  version=3
+ 
 -# Uncomment to examine a Webpage
 -# <Webpage URL> <string match>
 -#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
 -
 -# Uncomment to examine a Webserver directory
 -#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
 -
 -# Uncommment to examine a FTP server
 -#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
 -
 -# Uncomment to find new files on sourceforge
 -# http://sf.net/#PACKAGE#/#PACKAGE#-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
 -
 -# Uncomment to find new files on GooglePages
 -# http://code.google.com/p/#PACKAGE#/downloads/list?can=1 \
 -#  .*/#PACKAGE#-([-.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)
 -
 -# if tweaking of source is needed
 -# \
 -# debian debian/get-orig-source
 +https://github.com/js21/Fastaq/tags \
-    /js21/Fastaq/archive/([.\d]+)\.tar\.gz
++   /js21/Fastaq/archive/([.\d]+)\.tar\.gz

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/fastaq.git