[debian-edu-commits] debian-edu/sankore.git (#37) - master (branch) updated: upstream/2.00_git20130309-35-g22373bd

[Mike Gabriel]

The branch, master has been updated
       via  22373bdc6fe29c8b4995cafe95b2bc1d60f8cf41 (commit)
      from  a06d6e54f2e0a14b7f39edf7bf782191e5b8c330 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22373bdc6fe29c8b4995cafe95b2bc1d60f8cf41
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 16:28:20 2013 +0200

    update copyright file for Sankore-3.1 subfolder

-----------------------------------------------------------------------

Summary of changes:
 debian/copyright |   58 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/copyright b/debian/copyright
index 5d26004..540354e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,31 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
-Upstream-Name: sankore
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Sankore-3.1
 Upstream-Contact: Open-Sankoré Developers team <dev at open-sankore.org>
 Source: http://dev.open-sankore.org/
 Debianized-By: Miriam Ruiz <miriam at debian.org>
 Debianized-Date: Thu, 10 May 2012 18:29:03 +0200
 
-Files: *
-Copyright: Copyright (C) 2010  Open-Sankoré
-License: GPL-3+
+Files:
+ Sankore-3.1/plugins/*
+ Sankore-3.1/resources/win/sankore.rc
+ Sankore-3.1/src/*
+ Sankore-3.1/tools/*
+Copyright:
+ 2012,  Webdoc SA
+License: GPL-3+ with OpenSSL exception
+
+Files:
+ Sankore-3.1/resources/*
+License:
+ Sankore-3.1/public-domain
 
 Files: debian/*
-Copyright: Copyright (C) 2012, Miriam Ruiz <miriam at debian.org>
+Copyright:
+ 2012-2013, Miriam Ruiz <miriam at debian.org>
+ 2012-2013, Mike Gabriel <sunweaver at debian.org>
 License: GPL-3+
 
-License: GPL-3+
+License: GPL-3+ with OpenSSL exception
  Open-Sankoré 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 3 of the License,
@@ -21,6 +33,20 @@ License: GPL-3+
  "OpenSSL" library (or with modified versions of it that use the
  same license as the "OpenSSL" library).
  .
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations including
+ the two.
+ .
+ You must obey the GNU General Public License in all respects for all
+ of the code used other than OpenSSL. If you modify file(s) with this
+ exception, you may extend this exception to your version of the
+ file(s), but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version. If you delete
+ this exception statement from all source files in the program, then
+ also delete it here.
+ .
  Open-Sankoré 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
@@ -32,3 +58,21 @@ License: GPL-3+
  The complete text of version 3 of the GNU General Public License can be
  found in `/usr/share/common-licenses/GPL-3'.
 
+License: GPL-3+
+ Open-Sankoré 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 3 of the License,
+ with a specific linking exception for the OpenSSL project's
+ "OpenSSL" library (or with modified versions of it that use the
+ same license as the "OpenSSL" library).
+ .
+ Open-Sankoré 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.
+ .
+ On Debian systems, the complete text of the latest version of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL'.
+ .
+ The complete text of version 3 of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL-3'.


hooks/post-receive
-- 
sankore.git (Debian package sankore)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sankore.git" (Debian package sankore).