[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, master, updated. debian/0.5.0.042-1-2-gff2cc25

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 57416f72b3d0fb0f174b38df14a8830e7822bb1b
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Wed Mar 19 14:39:21 2008 +0100

    Apply patch from Niv Sardi <xaiki at debian.org> and change it to document the
    the license of data/* and doc/*. Also refer to common-licenses on Debian.

diff --git a/debian/copyright b/debian/copyright
index 0a400a8..b2ee88d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,41 +1,42 @@
-This package was debianized by Laurence J. Lane <ljlane at debian.org> on
-Sat, 28 Oct 2000 17:56:46 -0400.
-
-The source code is from the e17/libs/edje module of the enlightenment CVS
-tree. For more information, see:
-
- http://www.enlightenment.org/cvs.html
-
-Upstream Author: Carsten Haitzler <raster at rasterman.com>
+This package was downloaded from: http://download.enlightenment.org/snapshots/
 
-Copyright:
-
-  Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
-
-License:
+This package was debianized by Laurence J. Lane <ljlane at debian.org> on
+ Sat, 28 Oct 2000 17:56:46 -0400.
 
+Files: *
+Copyright: © 2000 Carsten Haitzler and various contributors (see AUTHORS)
+License: BSD-3
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to
   deal in the Software without restriction, including without limitation the
   rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   sell copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
-
+  .
   The above copyright notice and this permission notice shall be included in
-
+  .
   materials, and acknowledgment shall be given in the documentation, materials
   and software packages that this Software was used.
-
+  .
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-
+  .
   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.
-
-On Debian systems, the complete text of the BSD License can be found
-in `/usr/share/common-licenses/BSD'.
-
-The Debian packaging is:
-  (C) 2006 2007,Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+Files: data/edje-mode.el
+Copyright: © 2007 Gustavo Sverzut Barbieri <barbieri at gmail.com>
+License: GPL-2+
+ This program 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 2 of
+ the License, or (at your option) any later version.
+
+Files: debian/*
+Copyright: © 2006-2008 Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
+License: GPL-2+
+ The Debian packaging information is under the GPL, version 2 or later
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License (version 2) can be found in `/usr/share/common-licenses/GPL-2'.

-- 
Enlightenment DR17 graphical layout and animation library