[Pkg-octave-commit] [SCM] octave-nnet branch, master, updated. 89f0901947c51943822cd20bcbba326fdb2c3532
Rafael Laboissiere
rafael at debian.org
Fri May 22 02:50:54 UTC 2009
The following commit has been merged in the master branch:
commit 89f0901947c51943822cd20bcbba326fdb2c3532
Author: Rafael Laboissiere <rafael at debian.org>
Date: Fri May 22 04:50:52 2009 +0200
Use separate License stanzas in copyright file
diff --git a/debian/changelog b/debian/changelog
index 3ee10e1..5dfd60d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ octave-nnet (0.1.10-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
* debian/patches/pdfsources.diff: Add description
-- Rafael Laboissiere <rafael at debian.org> Mon, 18 May 2009 01:21:24 +0200
diff --git a/debian/copyright b/debian/copyright
index 061f210..2c37ec1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,19 +6,22 @@ Upstream-Source: http://octave.sourceforge.net/nnet/index.html
Files: inst/*.m
Copyright: © 2005, 2006, 2007 Michel D. Schmid
License: GPL-2+
- The *.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.
Files: doc/latex/* (these files are included in the package via the Debian
patch debian/patches/pdfsources.diff)
Copyright: © 2007, 2008 Michael D. Schmid
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. 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-nnet
More information about the Pkg-octave-commit
mailing list