[Pkg-octave-commit] [SCM] octave-image branch, master, updated. 8f8fed8b9de6bb58865a2f40504bd16bb6ad0484

[Rafael Laboissiere]

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

    Use separate License stanzas in copyright file

diff --git a/debian/changelog b/debian/changelog
index 3218c95..1a4f926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,12 @@ octave-image (1.0.9-1) UNRELEASED; urgency=low
   * debian/control:
     + (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
 
- -- Rafael Laboissiere <rafael at debian.org>  Mon, 13 Apr 2009 22:50:43 +0200
+  -- Rafael Laboissiere <rafael at debian.org>  Mon, 13 Apr 2009 22:50:43 +0200
 
 octave-image (1.0.8-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 0b3cc9b..0900087 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,32 +6,26 @@ Upstream-Source: http://octave.sourceforge.net/image/index.html
 Files: inst/bwlabel.m, inst/bwborder.m
 Copyright: © 2000 Etienne Grossmann
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/imginfo.m
 Copyright: © 2002 Etienne Grossmann
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/medfilt2.m, inst/ordfilt2.m, src/cordflt2.cc, inst/impad.m
 Copyright: © 2000 Teemu Ikonen
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/imrotate_Fourier.m, inst/imshear.m, inst/imtranslate.m
 Copyright: © 2002 Jeff Orchard
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/imrotate.m
 Copyright: © 2004-2005 Justus H. Piater
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/graythresh.m
 Copyright: © 2005  Barre-Piquot
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/fftconv2.m, src/graycomatrix.cc, src/houghtf.cc
 Copyright: © 2004 Stefan van der Walt
@@ -49,39 +43,32 @@ License: other
 Files: inst/mat2gray.m, inst/imhist.m
 Copyright: © 1999,2000  Kai Habel
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/imadjust.m
 Copyright: © 1999, 2000 Kai Habel
            © 2004 Josep Mones i Teixidor
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/corr2.m, inst/isbw.m, inst/grayslice.m, inst/isind.m,
  inst/histeq.m, inst/isgray.m, inst/mean2.m, inst/im2bw.m, inst/std2.m,
 Copyright: © 2000 Kai Habel
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/rgb2gray.m
 Copyright: © 2000, 2001 Kai Habel
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/imnoise.m
 Copyright: © 2000 Paul Kienzle
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: inst/edge.m, inst/bwselect.m, src/bwfill.cc
 Copyright: © 1999 Andy Adler
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/imread.m inst/imwrite.m
 Copyright: © 2002 Andy Adler
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: src/rotate_scale.cc
 Copyright: © 2003 Andy Adler
@@ -92,12 +79,10 @@ License: other
 Files: src/__bwdist.cc
 Copyright: © 2006 Pedro Felzenszwalb
 License: GPL-2+
- This files is under the GPL, version 2 or later.
 
 Files: src/pngcanvas.h, src/pngwrite.cc, src/pngread.cc
 Copyright: © 2003 Nadav Rotem
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/qtdecomp.m, inst/qtgetblk.m, inst/blkproc.m,
  inst/col2im.m, inst/uintlut.m, inst/cmpermute.m, inst/poly2mask.m,
@@ -107,24 +92,20 @@ Files: inst/qtdecomp.m, inst/qtgetblk.m, inst/blkproc.m,
  inst/applylut.m, inst/nlfilter.m, inst/dilate.m, inst/padarray.m
 Copyright: © 2004 Josep Mones i Teixidor
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/bwarea.m, inst/imresize.m, inst/fspecial.m
 Copyright: © 2005 Søren Hauberg
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/bwdist.m, inst/imperspectivewarp.m, inst/imremap.m,
  inst/label2rgb.m, inst/bwperim.m
 Copyright: © 2006 Søren Hauberg
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/imfilter.m, inst/im2uint16.m, inst/im2double.m,
  inst/im2uint8.m, inst/imsmooth.m
 Copyright: © 2007 Søren Hauberg
 License: GPL-2+
- These files are under the GPL, version 2 or later.
 
 Files: inst/bmpwrite.m, inst/colfilt.m, inst/colorgradient.m
 Copyright: © Paul Kienzle
@@ -151,9 +132,14 @@ License: PD
 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-image