[med-svn] [Git][med-team/hyphy][master] 2 commits: Revert "[skip ci] Fix copyright"

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / hyphy


Commits:
202a25df by Nilesh Patra at 2021-08-15T19:13:29+05:30
Revert "[skip ci] Fix copyright"

This reverts commit abbd40e8af270a0325509b119108d84ebccab2d4.

- - - - -
5962906e by Nilesh Patra at 2021-08-15T19:13:29+05:30
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/copyright


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-hyphy (2.5.31+dfsg-1) UNRELEASED; urgency=medium
+hyphy (2.5.31+dfsg-1) unstable; urgency=medium
 
   [ Michael R. Crusoe ]
   * Removed spelling patch, it was merged upstream
@@ -17,7 +17,7 @@ hyphy (2.5.31+dfsg-1) UNRELEASED; urgency=medium
     ZLIB *after* DEFAULT_LIBRARIES have been set
   * Fix copyright
 
- -- Étienne Mollier <emollier at debian.org>  Mon, 12 Jul 2021 23:33:35 +0200
+ -- Nilesh Patra <nilesh at debian.org>  Sun, 15 Aug 2021 19:06:23 +0530
 
 hyphy (2.5.28+dfsg-3) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
@@ -57,11 +57,6 @@ Files: src/contrib/gnuregex.h
 Copyright: 1985-1993 Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: src/contrib/mersenne_twister.cpp
-       src/contrib/mersenne_twister.h
-Copyright: 1997-2002, Makoto Matsumoto and Takuji Nishimura
-License: BSD-3-clause
-
 Files: debian/*
 Copyright: © 2015 Andreas Tille <tille at debian.org>
 License: MIT
@@ -106,31 +101,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public License
  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. 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.
- .
- 3. Neither the name of the Institute nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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.



View it on GitLab: https://salsa.debian.org/med-team/hyphy/-/compare/25c3e3a932d1a59b2687b1156598746696f1d1f3...5962906e7730ce0afd1374281cc747aa5d2d2790

-- 
View it on GitLab: https://salsa.debian.org/med-team/hyphy/-/compare/25c3e3a932d1a59b2687b1156598746696f1d1f3...5962906e7730ce0afd1374281cc747aa5d2d2790
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210815/0e476035/attachment-0001.htm>