[Pkg-octave-commit] [SCM] octave-sockets branch, master, updated. b8fa81844a6e696370ee3826d9df22442b087d48

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit b8fa81844a6e696370ee3826d9df22442b087d48
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 22 04:51:21 2009 +0200

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 4980cf6..97e2590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,10 @@ octave-sockets (1.0.5-3) UNRELEASED; urgency=low
     + (Standards-Version): Bump to 3.8.1 (add file debian/README.source)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
-  * debian/copyright: Use DEP5 URL in Format-Specification
+  * debian/copyright:
+    + Use DEP5 URL in Format-Specification
+    + Use separate License stanzas for instructing about the location of
+      the different licenses used in the package
   * debian/patches/autoload-yes.diff: Add description
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:51:43 +0200
diff --git a/debian/copyright b/debian/copyright
index ac7e989..078096c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,30 +3,21 @@ Upstream-Name: sockets package for Octave
 Upstream-Maintainer: Tom Holroyd <tomh at kurage.nimh.nih.gov>
 Upstream-Source: http://octave.sourceforge.net/sockets/index.html
 
+Files: debian/*
+Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
+License: GPL-3+
 
-
-It was downloaded from http://octave.sf.net
-
-Upstream Author:
-
-	John Swensen <jpswensen at comcast.net>
-	Tom Holroyd <tomh at kurage.nimh.nih.gov>
-
-Copyright:
-
-    Copyright (C) 2007 John Swensen
-    Copyright (C) 2007 Tom Holroyd
-
+Files: *
+Copyright: © 2008 John Swensen  and Tom Holroyd
 License: GPL-2+
- This package 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.
 
-On Debian systems, the complete text of the GNU General Public License,
-version 2, can be found in file `/usr/share/common-licenses/GPL-2.
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 3, can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
 
-The Debian packaging is (C) 2007, Olafur Jens Sigurdsson <ojsbug at gmail.com> and
-is licensed under the GNU General Public License, version 3 or later,
-see `/usr/share/common-licenses/GPL-3'.

-- 
octave-sockets