[med-svn] r15997 - trunk/packages/mapsembler2/trunk/debian

[Olivier Sallou]

Author: osallou
Date: 2014-02-05 07:37:41 +0000 (Wed, 05 Feb 2014)
New Revision: 15997

Modified:
   trunk/packages/mapsembler2/trunk/debian/changelog
   trunk/packages/mapsembler2/trunk/debian/copyright
Log:
fix copyright

Modified: trunk/packages/mapsembler2/trunk/debian/changelog
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/changelog	2014-02-05 07:31:07 UTC (rev 15996)
+++ trunk/packages/mapsembler2/trunk/debian/changelog	2014-02-05 07:37:41 UTC (rev 15997)
@@ -1,9 +1,3 @@
-mapsembler2 (2.0.5+dfsg-2) UNRELEASED; urgency=low
-
-  * Add man auto generated page 
-
- -- Olivier Sallou <osallou at debian.org>  Sat, 01 Feb 2014 18:21:49 +0100
-
 mapsembler2 (2.0.5+dfsg-1) unstable; urgency=medium
 
   * First debian package (Closes: #737099).

Modified: trunk/packages/mapsembler2/trunk/debian/copyright
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/copyright	2014-02-05 07:31:07 UTC (rev 15996)
+++ trunk/packages/mapsembler2/trunk/debian/copyright	2014-02-05 07:37:41 UTC (rev 15997)
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: discosnp
-Source: http://colibread.inria.fr/discosnp/
+Upstream-Name: mapsembler2
+Source: http://colibread.inria.fr/mapsembler2
 Files-Excluded: visu
 
 License: CeCILL
@@ -498,16 +498,9 @@
  .
  .
 
-Files: minia/*
-Copyright: 2012 Rayan Chiki <rayan.chikhi at ens-cachan.org>
-           2012 Guillaume Rizk
-License: CeCILL
 
-Files: *
-Copyright: 2013 INRIA / IRISA
-License: CeCILL
-
 Files: maps/read_coherence_mapsembler/libchash.*
+       kissreads_g/read_coherence_mapsembler/libchash.*
 Copyright: 1998-2005 Google Inc.
 License: BSD
  All rights reserved.
@@ -538,35 +531,14 @@
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: minia/*
+Copyright: 2012 Rayan Chiki <rayan.chikhi at ens-cachan.org>
+           2012 Guillaume Rizk
+License: CeCILL
 
-Files: minia/ttmath/*
-Copyright: Tomasz Sowa <t.sowa at ttmath.org>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- .
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
-  * Neither the name Tomasz Sowa nor the names of contributors to this
-    project may be used to endorse or promote products derived
-    from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
+Files: *
+Copyright: 2013 INRIA / IRISA
+License: CeCILL
 
 Files: debian/*
 Copyright: 2013 Olivier Sallou <osallou at debian.org>