[med-svn] r14343 - trunk/packages/infernal/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-08-05 11:07:21 +0000 (Mon, 05 Aug 2013)
New Revision: 14343

Modified:
   trunk/packages/infernal/trunk/debian/changelog
   trunk/packages/infernal/trunk/debian/copyright
Log:
DEP5


Modified: trunk/packages/infernal/trunk/debian/changelog
===================================================================
--- trunk/packages/infernal/trunk/debian/changelog	2013-08-05 10:55:09 UTC (rev 14342)
+++ trunk/packages/infernal/trunk/debian/changelog	2013-08-05 11:07:21 UTC (rev 14343)
@@ -15,6 +15,7 @@
   * debian/rules:
      - remove redundant setting for flags which is handled by debhelper 9
        automatically
+  * debian/copyright: DEP5
 
  -- Andreas Tille <tille at debian.org>  Mon, 05 Aug 2013 12:06:12 +0200
 

Modified: trunk/packages/infernal/trunk/debian/copyright
===================================================================
--- trunk/packages/infernal/trunk/debian/copyright	2013-08-05 10:55:09 UTC (rev 14342)
+++ trunk/packages/infernal/trunk/debian/copyright	2013-08-05 11:07:21 UTC (rev 14343)
@@ -1,24 +1,19 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Steffen Moeller <moeller at debian.org>
-X-Debianized-Date: Mon, 10 Sep 2007 23:15:37 +0200
-X-Source-Downloaded-From: ftp://infernal.janelia.org/pub/software/infernal
-X-Upstream-Author: Infernal developer team at HHMI Janelia Farm:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Infernal developer team at HHMI Janelia Farm:
 			Diana Kolbe <kolbed janelia.hhmi.org>
 			Eric Nawrocki <nawrockie janelia.hhmi.org>
 			Sean Eddy <eddys janelia.hhmi.org>.
-                   The "rigfilters" code was contributed by Zasha Weinberg
-		   and Larry Ruzzo, University of Washington, Seattle.
+Source: ftp://infernal.janelia.org/pub/software/infernal
 
-
 Files: debian/*
 Copyright: © 2007-2008 Steffen Moeller <moeller at debian.org>
            © 2007-2008 Charles Plessy <plessy at debian.org>
-           © 2009 Andreas Tille <tille at debian.org>
-License: Same as infernal
+           © 2009-2013 Andreas Tille <tille at debian.org>
+License: GPL-3
 
 Files: rigfilters/*
 Copyright: © 2004, Zasha Weinberg
-License: BSD family
+License: BSD-like
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -49,20 +44,22 @@
 Files: easel/{esl_sse.c,esl_vmx.c}
 Copyright: © 2007 Julien Pommier
            © 1992 Stephen Moshier
-License: BSD
+License: BSD-Easel
 
 Files: easel/easel.c::esl_tmpfile()
 Copyright: © 1999-2001 David A. Wheeler
-License: MIT
+License: BSD-Easel
 
 Files: easel/esl_regexp.c
 Copyright: © 1986, 1993, 1995 by University of Toronto
-License: BSD
+License: BSD-Easel
 
 Files: easel/*
 Copyright: © 2004-2008 Sean R. Eddy
            © 2006-2008 Howard Hughes Medical Institute
-License: Easel - a library of C functions for biological sequence analysis
+License: BSD-Easel
+
+License: BSD-Easel
  @EASEL_COPYRIGHT@
  .
  The Easel library is freely modifiable and redistributable under the
@@ -101,16 +98,18 @@
 
 
 Files: Userguide.pdf
-X-Comment: The PDFs that are coming with the sources from which the userguide is
+Copyright: Sean R. Eddy
+License: GPL-3
+Comment: The PDFs that are coming with the sources from which the userguide is
  built are indeed upstream's original sources. They are edited with a PDF
  editor. Upstream, Dr Eddy, was consulted in this issue.
 
 
 Files: *
-Copyright: © 2001-2007 HHMI Janelia Farm
-           © 1991-2007      Sean R. Eddy
-           © 2005-2007      Eric P. Nawrocki
-           © 2005-2007      Diana L. Kolbe
+Copyright: © 2001-2013 HHMI Janelia Farm
+           © 1991-2013      Sean R. Eddy
+           © 2005-2013      Eric P. Nawrocki
+           © 2005-2011      Diana L. Kolbe
            © 2004           Zasha Weinberg
            © 1990           Don G. Gilbert
            © 1995-2006      Washington University in St. Louis
@@ -120,6 +119,8 @@
            © 1989-2001      Free Software Foundation
            © 1991           Massachusetts Institute of Technology
 License: GPL-3
+
+License: GPL-3
  This suite of programs is free software. You can redistribute it
  and/or modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the
@@ -139,5 +140,5 @@
  along with this software, in the file LICENSE; if not, write to the
  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  MA 02110-1301, USA or see http://www.gnu.org/
-X-Comment: On Debian systems, the complete text of the GNU General Public
+Comment: On Debian systems, the complete text of the GNU General Public
  License version 3 can be found in `/usr/share/common-licenses/GPL-3'.