[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.2-13-gb69dfee

[Andreas Tille]

The following commit has been merged in the master branch:
commit 78220359900c93943e08e844d26811ab37457b4f
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 31 08:49:17 2012 +0200

    DEP5 verified using `cme fix dpkg-copyright`

diff --git a/debian/changelog b/debian/changelog
index 4254f6b..27924ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ jellyfish (1.1.4-1) UNRELEASED; urgency=low
      - Standards-Version: 3.9.3 (no changes needed)
      - Move citation from long desciption to debian/upstream
   * debian/upstream: Use the agreed way to specify citations
+  * debian/copyright: DEP5 verified using
+      cme fix dpkg-copyright
 
- -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 08:45:23 +0200
+ -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 08:48:27 +0200
 
 jellyfish (1.1.2-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 4e4870f..118bd53 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JELLYFISH
 Upstream-Contact: Guillaume Marçais <gmarcais at umd.edu>
 Source: http://www.cbcb.umd.edu/software/jellyfish/
@@ -15,7 +15,7 @@ License: GPL
 
 Files: half.h
 Copyright: Copyright 2002, Industrial Light & Magic
-License:
+License: other
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -40,3 +40,4 @@ License:
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

-- 
count k-mers of DNA