[Pkg-octave-commit] [SCM] octave-struct branch, master, updated. ba4f4de9ee6191c106c698771dda5f4b77cddfd6
Rafael Laboissiere
rafael at debian.org
Fri May 22 02:51:31 UTC 2009
The following commit has been merged in the master branch:
commit ba4f4de9ee6191c106c698771dda5f4b77cddfd6
Author: Rafael Laboissiere <rafael at debian.org>
Date: Fri May 22 04:51:29 2009 +0200
Use separate License stanzas in copyright file
diff --git a/debian/changelog b/debian/changelog
index 99cf150..937b7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ octave-struct (1.0.7-1) UNRELEASED; urgency=low
+ (Vcs-Git, Vcs-Browser): Adjust to new Git repository
* debian/source.lintian-overrides: Add file for overriding Lintian
warnings build-depends-without-arch-dep
- * 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, 12 Apr 2009 17:51:25 +0200
diff --git a/debian/copyright b/debian/copyright
index 4ce5508..baf37b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,19 +6,21 @@ Upstream-Source: http://octave.sourceforge.net/struct/index.html
Files: inst/getfields.m, inst/setfields.m
Copyright: © 2002 Etienne Grossmann
License: GPL-2+
- These *.m files are under the GPL, version 2 or later.
Files: inst/test_struct.m
Copyright: © 2004 Etienne Grossmann
License: GPL-2+
- This *.m 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-struct
More information about the Pkg-octave-commit
mailing list