[SCM] dataset manipulation GUI generator branch, master, updated. debian/1.3.2-2-2-gfe28c35
Picca Frédéric-Emma?==?UTF-8?Q?nuel
picca at synchrotron-soleil.fr
Mon Jul 25 20:59:49 UTC 2011
The following commit has been merged in the master branch:
commit fe28c35037f14e5270f0a1e2a71b3d28497fe50a
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Mon Jul 25 22:59:37 2011 +0200
save the copyright file with config-edit
diff --git a/debian/copyright b/debian/copyright
index a7c7162..a1a22f5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,15 +5,15 @@ Source: http://code.google.com/p/guidata
Files: debian/*
Copyright: © 2010-2011, Picca Frédéric-Emmanuel <picca at debian.org>
-Licence: CeCILLv2
+License: CeCILLv2
Files: *
Copyright: © 2010-2011, CEA Commissariat à l'Energie Atomique
-Licence: CeCILLv2
+License: CeCILLv2
Files: guidata/userconfig.py guidata/qt/*
Copyright: © 2009-2011 Pierre Raybaut
-Licence: MIT
+License: MIT
License: CeCILLv2
CeCILL FREE SOFTWARE LICENSE AGREEMENT
@@ -491,7 +491,7 @@ License: CeCILLv2
.
Version 2.0 dated 2006-09-05.
-Licence: MIT
+License: MIT
userconfig License Agreement (MIT License)
------------------------------------------
.
@@ -517,3 +517,4 @@ Licence: MIT
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.
+
--
dataset manipulation GUI generator
More information about the debian-science-commits
mailing list