[med-svn] r10031 - trunk/packages/qiime/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-03-20 13:39:51 +0000 (Tue, 20 Mar 2012)
New Revision: 10031

Modified:
   trunk/packages/qiime/trunk/debian/changelog
   trunk/packages/qiime/trunk/debian/copyright
Log:
Missed to update debian/copyright in latest upload -> now DEP5


Modified: trunk/packages/qiime/trunk/debian/changelog
===================================================================
--- trunk/packages/qiime/trunk/debian/changelog	2012-03-20 13:22:37 UTC (rev 10030)
+++ trunk/packages/qiime/trunk/debian/changelog	2012-03-20 13:39:51 UTC (rev 10031)
@@ -1,3 +1,10 @@
+qiime (1.3.0-4) UNRELEASED; urgency=low
+
+  * debian/copyright: rewritten to confirm DEP5 and verified using
+      cme fix dpkg-copyright
+
+ -- Andreas Tille <tille at debian.org>  Tue, 20 Mar 2012 14:23:22 +0100
+
 qiime (1.3.0-3) unstable; urgency=low
 
   [ Charles Plessy ]

Modified: trunk/packages/qiime/trunk/debian/copyright
===================================================================
--- trunk/packages/qiime/trunk/debian/copyright	2012-03-20 13:22:37 UTC (rev 10030)
+++ trunk/packages/qiime/trunk/debian/copyright	2012-03-20 13:39:51 UTC (rev 10031)
@@ -1,28 +1,36 @@
-This work was packaged for Debian by:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: QIIME
+Upstream-Contact: Greg Caporaso <gregcaporaso at gmail.com>
+Source: http://sourceforge.net/projects/qiime/files/releases/
 
-    Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
-    and Steffen Moeller <moeller at debian.org>
-    on Fri, 25 Jun 2010 17:23:58 +0200
+Files: *
+Copyright: 2010-2012 Greg Caporaso <gregcaporaso at gmail.com>,
+                     Kyle Bittinger and others
+License: GPL-2+
+ This program 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 License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ For other licensing arrangements, please contact Daniel J. Schaid.
+ .
+ On a Debian system, the GNU GPL license version 2 is distributed in the file
+ ./usr/share/common-licenses/GPL-2..
 
-It was downloaded from <http://pynast.sorceforge.net>
+Files: debian/*
+Copyright: 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
+                Steffen Moeller <moeller at debian.org>
+           2011-2012 Tim Booth <tbooth at ceh.ac.uk>,
+                Andreas Tille <tille at debian.org>
+License: GPL-2+
+ Same as software itself.
 
-Upstream Author:
-
-    Greg Caporaso <gregcaporaso at gmail.com>
-    Kyle Bittinger
-
-Copyright:
-
-    Copyright 2010, The QIIME Project
-
-License:
-
-    GPL-2
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
-    and Steffen Moeller <moeller at debian.org>
-
-and is licensed under the same copyright,
-see `/usr/share/common-licenses/GPL-2'.