[Pkg-octave-commit] [SCM] octave-octgpr branch, master, updated. 959e9f03d394b8ec5db34218caabe6a47a0c9f5a

Rafael Laboissiere rafael at debian.org
Fri May 22 02:51:02 UTC 2009


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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 69ea1a1..f2932d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ octave-octgpr (1.1.5-1) UNRELEASED; urgency=low
   * debian/README.source: Remove unneeded file
   * debian/control: Drop quilt from Build-Depends
   * debian/rules: Do not include patchsys-quilt.mk
-  * 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
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 17 May 2009 22:49:53 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 02067d5..90670d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,17 @@ Upstream-Source: http://octave.sourceforge.net/octgpr/index.html
 Files: src/*.f, src/*.h, src/*.c, src/*.cc
 Copyright: © 2008 VZLU Prague, a.s., Czech Republic
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: debian/*
 Copyright: © 2008 Ólafur Jens Sigurðsson <ojsbug at gmail.com>
 License: GPL-3+
- The Debian packaging information is under the GPL, version 3 or later.
 
-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. The
-complete text of the GNU General Public License, version 3, can be found
-in the file `/usr/share/common-licenses/GPL-3.
+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'.

-- 
octave-octgpr



More information about the Pkg-octave-commit mailing list