Merged branch 'nmu/1.8.5-0.1'.

Conflicts:
	debian/changelog
	debian/control

diff --git a/debian/changelog b/debian/changelog
index 9b8b1c62db86ca4ab34d866f91009b36ea5669ad..af20d6d4575d1b5da450b8dca6d7514ccd1055b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pfstools (1.8.5-1) unstable; urgency=low
+
+  * debian/control:
+    - Updated standards-version to 3.9.1 -- no changes.
+
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 31 Jul 2010 19:31:26 +0200
+
 pfstools (1.8.5-0.1) unstable; urgency=low
 
   * Non-maintainer upload.

diff --git a/debian/control b/debian/control
index 4398056f4ac8e5eb809ffbf31b50089042aa9a2a..7b4954b61a3221d64429d6c6dce6f58e1f6b9f31 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Sebastian Harl <tokkee@debian.org>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), gfortran, autotools-dev, libqt4-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://pfstools.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git
 Vcs-Browser: http://git.debian.org/?p=pkg-phototools/pfstools.git

diff --git a/debian/copyright b/debian/copyright
index aa62c08c0a3e659fc3679429d5fcdd72376d298b..0afa5e214141280a7eddbb2073a21205f7a0fce4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,7 @@ Upstream Authors:
        For contributions, see AUTHORS.
 
 Copyright Holders:
+       Free Software Foundation, Inc.
        Grzegorz Krawczyk <krawczyk@mpi-sb.mpg.de>
        Martin Lambers <marlam@marlam.de>
        Rafal Mantiuk <mantiuk@mpi-sb.mpg.de>
@@ -19,11 +20,16 @@ License:
        File src/fileformat/pfsingdal.cpp
        Copyright © 2008 Martin Lambers <marlam@marlam.de>
 
-       All other files (except doc/data_model.png, doc/pfs_format_spec.tex and
-                  src/pfs/*)
+       All other files (except doc/data_model.png, doc/pfs_format_spec.tex, m4/*,
+                        src/pfs/* and some files in src/hdrhtml/)
        Copyright © 2003-2009 Rafal Mantiuk <mantiuk@mpi-sb.mpg.de>
        Copyright © 2003-2005 Grzegorz Krawczyk <krawczyk@mpi-sb.mpg.de>
 
+       Parts of the files
+           src/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.js
+           src/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_page_templ.html
+       Copyright © Christian Bloch
+
        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
@@ -66,7 +72,6 @@ can be found in `/usr/share/common-licenses/LGPL'.
 
        Files doc/data_model.png
              doc/pfs_format_spec.tex
-
        Copyright © 2003 Rafal Mantiuk <mantiuk@mpi-sb.mpg.de>
        Copyright © 2003 Grzegorz Krawczyk <krawczyk@mpi-sb.mpg.de>
 
@@ -80,6 +85,38 @@ can be found in `/usr/share/common-licenses/LGPL'.
 On Debian systems, the complete text of the GNU Free Documentation License
 can be found in `/usr/share/common-licenses/GFDL'.
 
-The Debian packaging is © 2007-2009, Sebastian Harl <tokkee@debian.org> and
-is licensed under the GPL, see above.
+       Files m4/*.m4
+       Copyright © 1996-2008 Free Software Foundation, Inc.
+
+       This file is free software; the Free Software Foundation gives
+       unlimited permission to copy and/or distribute it, with or without
+       modifications, as long as this notice is preserved.
+
+       File src/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/mootools-1.2.4.js
+       Copyright © 2006-2009 Valerio Proietti
+
+       File src/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/mouse2touch.js
+       Copyright © Chi Wai Lau
+       Copyright © Scott Kyle
+
+       Permission is hereby granted, free of charge, to any person obtaining a
+       copy of this software and associated documentation files (the "Software"),
+       to deal in the Software without restriction, including without limitation
+       the rights to use, copy, modify, merge, publish, distribute, sublicense,
+       and/or sell copies of the Software, and to permit persons to whom the
+       Software is furnished to do so, subject to the following conditions:
+
+       The above copyright notice and this permission notice shall be included in
+       all copies or substantial portions of the Software.
+
+       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+       IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+       FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+       THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+       LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+       FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+       DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is © 2007-2010, Sebastian Harl <tokkee@debian.org> and
+is licensed under the GPL, version 2 or later, see above.