UNRELEASED 2.3.3-1

1 files changed, 56 insertions, 43 deletions

diff --git a/debian/copyright b/debian/copyright
index 8882d15..d869e5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,56 @@
-This package was debianized by Luca Falavigna <dktrkranz@ubuntu.com> on
-Sat, 27 Dec 2008 11:33:28 +0100.
-
-It was downloaded from http://scons.tigris.org/svn/scons
-
-Upstream Author:
-
-    Steven Knight <knight@baldmt.com>
-
-Copyright:
-
-    Copyright © 2001-2009 The SCons Foundation
-    Copyright © 1999-2001 Steve Purcell
-    Copyright © 1999-2006 Gregory P. Ward.
-    Copyright © 2001-2003 Steven Knight
-    Copyright © 2001-2004 Twisted Matrix Laboratories
-    Copyright © 2002-2006 Python Software Foundation.
-    Copyright © 2003-2005 Peter Astrand
-    Copyright © 2003 Stichting NLnet Labs
-
-License:
-
-    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 all copies or substantial portions of the Software.
-    
-    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 THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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.
-
-The Debian packaging is copyright 2008-2011, Luca Falavigna <dktrkranz@debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: scons-doc
+Upstream-Contact: Steven Knight <knight@baldmt.com>
+Source: http://www.scons.org
+
+Files: *
+Copyright: 2001-2014 The SCons Foundation
+           1999-2006 Gregory P. Ward.
+           2001-2003 Steven Knight
+           2001-2004 Twisted Matrix Laboratories
+           2002-2006 Python Software Foundation.
+           2003-2005 Peter Astrand
+           2003      Stichting NLnet Labs
+License: Expat
+
+Files: debian/*
+Copyright: 2008-2011 Luca Falavigna <dktrkranz@debian.org>
+           2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
+License: GPL-3.0+
+
+License: Expat
+ 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 all copies or substantial portions of the Software.
+ .
+ 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 THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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.
+
+License: GPL-3.0+
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in "/usr/share/common-licenses/GPL-3".