[med-svn] r20551 - in trunk/packages/qiime/trunk/debian: . source

Andreas Tille tille at moszumanska.debian.org
Wed Nov 25 15:55:39 UTC 2015


Author: tille
Date: 2015-11-25 15:55:38 +0000 (Wed, 25 Nov 2015)
New Revision: 20551

Added:
   trunk/packages/qiime/trunk/debian/source/lintian-overrides
Modified:
   trunk/packages/qiime/trunk/debian/changelog
   trunk/packages/qiime/trunk/debian/copyright
Log:
DEP5 fixes, Add lintian override for false positive about JS without source



Modified: trunk/packages/qiime/trunk/debian/changelog
===================================================================
--- trunk/packages/qiime/trunk/debian/changelog	2015-11-25 13:09:06 UTC (rev 20550)
+++ trunk/packages/qiime/trunk/debian/changelog	2015-11-25 15:55:38 UTC (rev 20551)
@@ -1,3 +1,15 @@
+qiime (1.9.1+dfsg-1) UNRELEASED; urgency=medium
+
+  * Take over changes from BioLinux for new upstream version
+  * adapt d/watch and get-orig-source target to new uscan
+  * cme fix dpkg-control
+  * Remove denoiser from d/control since there is no such package
+    any more
+  * DEP5 fixes
+  * Add lintian override for false positive about JS without source
+
+ -- Andreas Tille <tille at debian.org>  Wed, 29 Jul 2015 14:31:20 +0200
+
 qiime (1.9.1+dfsg-0ubuntu1) trusty; urgency=medium
 
   * New upstream - should be a bugfix upgrade
@@ -10,18 +22,6 @@
 
  -- Tim Booth <tbooth at ceh.ac.uk>  Thu, 30 Jul 2015 10:17:08 +0100
 
-qiime (1.9.0+dfsg-1) UNRELEASED; urgency=medium
-
-  * Take over changes from BioLinux for new upstream version
-  * adapt d/watch and get-orig-source target to new uscan
-  * cme fix dpkg-control
-  * Remove denoiser from d/control since there is no such package
-    any more
-  TODO:
-     svn://anonscm.debian.org/debian-med/trunk/packages/python-burrito/trunk/
-
- -- Andreas Tille <tille at debian.org>  Wed, 29 Jul 2015 14:31:20 +0200
-
 qiime (1.9.0+dfsg-0biolinux5) trusty; urgency=medium
 
   * Fix /usr/bin/qiime (again) and update help for usearch

Modified: trunk/packages/qiime/trunk/debian/copyright
===================================================================
--- trunk/packages/qiime/trunk/debian/copyright	2015-11-25 13:09:06 UTC (rev 20550)
+++ trunk/packages/qiime/trunk/debian/copyright	2015-11-25 15:55:38 UTC (rev 20551)
@@ -11,28 +11,7 @@
                      Kyle Bittinger and others
 License: GPL-2+
 
-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..
-
 Files: qiime_test_data/align_seqs/core_set_aligned.fasta.imputed
-       qiime_test_data/filter_alignment/lanemask_in_1s_and_0s
 Copyright: (C) The Greengenes Database Consortium <http://greengenes.secondgenome.com/>
 License: CC-BY-SA 
  The Greengenes Database by The Greengenes Database Consortium is licensed under
@@ -54,31 +33,12 @@
 Copyright: Denis Howlett <denish at isocra.com>
 License: MIT
 
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-
 Files: qiime/support_files/js/overlib.js
 Copyright: 1998-2004 Erik Bosrup. All rights reserved.
+License: overlib
  Contributors are listed on the homepage.
  This file might be old, always check for the latest version at:
-   http://www.bosrup.com/web/overlib/
+   https://github.com/overlib/overlib
  .
  Please read the license agreement (available through the link above)
  before using overLIB. Direct any licensing questions to erik at bosrup.com.
@@ -89,6 +49,7 @@
  use overLIB and submit changes of the script so other people can use
  them as well.
 Comment: The link above throws 404
+ Project moved to Github but the License file was not moved.
 
 Files: debian/*
 Copyright: 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
@@ -96,5 +57,44 @@
            2011-2012 Tim Booth <tbooth at ceh.ac.uk>,
                 Andreas Tille <tille at debian.org>
 License: GPL-2+
- Same as software itself.
 
+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.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+

Added: trunk/packages/qiime/trunk/debian/source/lintian-overrides
===================================================================
--- trunk/packages/qiime/trunk/debian/source/lintian-overrides	                        (rev 0)
+++ trunk/packages/qiime/trunk/debian/source/lintian-overrides	2015-11-25 15:55:38 UTC (rev 20551)
@@ -0,0 +1,4 @@
+# These files are actually editable JS source files and the lintian error is a false positive
+qiime source: source-is-missing qiime/support_files/js/overlib.js
+qiime source: source-is-missing qiime_test_data/make_2d_plots/js/overlib.js
+




More information about the debian-med-commit mailing list