[med-svn] [gwama] 01/04: Drop 02_Fix_license_issue.patch fixed upstream and update copyright according
Dylan Aïssi
bob.dybian-guest at moszumanska.debian.org
Fri Aug 26 06:14:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
bob.dybian-guest pushed a commit to branch master
in repository gwama.
commit f9ffd17ec2d07c2a12df698aae2eba9ed6366ddd
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date: Fri Aug 26 07:40:58 2016 +0200
Drop 02_Fix_license_issue.patch fixed upstream and update copyright according
---
debian/changelog | 4 +-
debian/copyright | 77 -------------------------------
debian/patches/02_Fix_license_issue.patch | 16 -------
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 95 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2eb4b16..97d9658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-gwama (2.1+dfsg-3) UNRELEASED; urgency=medium
+gwama (2.2.2+dfsg-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Use secure VCS URIs.
* Bump Policy to 3.9.8 (no change needed).
* Add a patch to fix spelling-error-in-binary.
* Set all hardening options.
* Update uscan options.
* Update upstream website.
+ * Drop d/p/02_Fix_license_issue.patch fixed upstream.
-- Dylan Aïssi <bob.dybian at gmail.com> Mon, 22 Aug 2016 23:46:43 +0200
diff --git a/debian/copyright b/debian/copyright
index 2977e08..8c7fc1e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,83 +18,6 @@ Copyright: 1984-2007 Stephen L. Moshier (Cephes Math Library Release 2.8), Serge
License: BSD-3-clause
Comment: ALGLIB changes its license (from BSD-3-clause to GPL2+) with the version 2.1.0 in September 2009 (See http://www.alglib.net/arcnews.php ). GWAMA uses old parts of ALGLIB before the relicensing.
-Files: commandLine.cpp
-Copyright: 2010 Andrew P Morris, Reedik Mägi
-License: BSD-3-clause
-Comment:
- -----------------
- Date: Thu, 4 Dec 2014 07:10:56 +0100
- From: Dylan <bob.dybian at gmail.com>
- To: <amorris at well.ox.ac.uk>
- .
- Dear Andrew P. Morris,
- .
- I am involved in Debian Med project which provide a GNU/Linux
- distribution for biomedical research. I am making a package of GWAMA
- for integration in official Debian repository, but some points need to be
- clarify to push GWAMA in Debian.
- .
- The first point is in your paper you said that GWAMA was released under BSD
- license, but you didn't precise which BSD license. I suppose it is
- BSD-3-clause license, could you please confirm it?
- .
- The second point to clarify is in the file "commandLine.cpp" at line 57, it
- says "GNU General Public License, v2", could you please confirm that it is
- a mistake and you want to refer to the BSD license from the first point?
- .
- Best regards,
- Dylan
- -----------------
- Date: Thu, 04 Dec 2014 08:41:55 +0200
- From: Reedik Magi <reedikm at gmail.com>
- To: <bob.dybian at gmail.com>
- CC: Andrew Morris <amorris at well.ox.ac.uk>
- .
- Dear Dylan,
- .
- We are mainly research oriented and actually have very little knowledge
- about pros and cons of different licence types - but yes BSD-3 clause seems
- to be appropriate. GNU licence, which is written into the log file is an
- error and will be fixed in new release.
- .
- Best wishes,
- Reedik
- .
- NB. GWAMA source files contain files from ALGLIB project, which have
- different copyright clauses (e.g. file normaldistr.cpp) but seem to be very
- similar to BSD-3 clause.
- -----------------
- Date: Thu, 4 Dec 2014 08:25:42 +0100
- From: Dylan <bob.dybian at gmail.com>
- To: Reedik Magi <reedikm at gmail.com>
- Cc: Andrew Morris <amorris at well.ox.ac.uk>
- .
- Dear Reedik,
- Thank you for your response.
- .
- As you can see the copyright file in debian folder contains all
- copyright of GWAMA files and already takes account of ALGLIB copyright.
- .
- If you agree, I will patch the commandLine.cpp file in debian package to
- make reference to BSD-3 clause. Could I copy your previous mail to a file
- in debian package for more transparency about these previous issues ?
- .
- Best regards,
- Dylan
- -----------------
- Date: Thu, 04 Dec 2014 09:30:34 +0200
- From: Reedik Magi <reedikm at gmail.com>
- To: Dylan <bob.dybian at gmail.com>
- CC: Andrew Morris <amorris at well.ox.ac.uk>
- .
- Dear Dylan,
- .
- Yes - feel free to do that!
- .
- Best wishes,
- Reedik
- -----------------
-
Files: statistics.*
Copyright: 2002-2003 Reedik Mägi, Lauris Kaplinski, BioData, Ltd.
License: BSD-3-clause
diff --git a/debian/patches/02_Fix_license_issue.patch b/debian/patches/02_Fix_license_issue.patch
deleted file mode 100644
index 073fa2d..0000000
--- a/debian/patches/02_Fix_license_issue.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Dylan Aïssi <bob.dybian at gmail.com>
-Description: Fix license issue in commandLine.cpp, for more information see debian/copyright file.
-Forwarded: Yes
-Last-Update: 2014-12-04
-
---- a/commandLine.cpp
-+++ b/commandLine.cpp
-@@ -54,7 +54,7 @@
- cout << "| GWAMA |" << v << "| May, 2010 |" << endl;
- cout << "|----------------------------------------------------------|" << endl;
- cout << "| (C) 2008 Reedik Magi & Andrew P Morris |" << endl;
-- cout << "| GNU General Public License, v2 |" << endl;
-+ cout << "| BSD-3-clause License |" << endl;
- cout << "|----------------------------------------------------------|" << endl;
- cout << "| For documentation, citation & bug-report instructions: |" << endl;
- cout << "| http://www.well.ox.ac.uk/GWAMA/ |" << endl;
diff --git a/debian/patches/series b/debian/patches/series
index d6ae46a..bc309af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_Makefile_Add_FLAGS_to_activate_Hardening.patch
-02_Fix_license_issue.patch
03.Fix_lintian_spelling-error-in-binary.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gwama.git
More information about the debian-med-commit
mailing list