[Debian-iot-packaging] [openzwave] 01/02: Import Debian patch 1.5+ds-2

[Thorsten Alteholz]

This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository openzwave.

commit 7d4ba07ef197b81572cf7f0130eb5b041cc28131
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Tue Nov 29 21:10:00 2016 +0100

    Import Debian patch 1.5+ds-2
---
 debian/changelog |  7 +++++++
 debian/control   | 10 +++++-----
 debian/copyright | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8109384..1b11e92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openzwave (1.5+ds-2) unstable; urgency=medium
+
+  * move from non-free to main
+    (comment in debian/copyright for AESBSD)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Tue, 29 Nov 2016 21:10:00 +0100
+
 openzwave (1.5+ds-1) unstable; urgency=medium
 
   * Initial release (Closes: #791965)
diff --git a/debian/control b/debian/control
index 058fc16..15a51d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: openzwave
 Maintainer: Thorsten Alteholz <debian at alteholz.de>
-Section: non-free/devel
+Section: devel
 Priority: optional
 Build-Depends: debhelper (>=9), dh-exec (>=0.2), g++ (>= 4.4), quilt, libudev-dev, libxml2-utils
 Standards-Version: 3.9.8
 Homepage: http://www.openzwave.com/
 
 Package: libopenzwave1.5
-Section: non-free/libs
+Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -20,7 +20,7 @@ Description: API to use a Z-Wave controller
  This package contains the library.
 
 Package: libopenzwave1.5-dev
-Section: non-free/libdevel
+Section: libdevel
 Depends: ${misc:Depends}, libopenzwave1.5 (= ${binary:Version})
 Architecture: any
 Description: header files for the openzwave library
@@ -32,7 +32,7 @@ Description: header files for the openzwave library
  This package contains files for developing.
 
 Package: libopenzwave-doc
-Section: non-free/doc
+Section: doc
 Depends: ${misc:Depends}, libjs-jquery
 Architecture: all
 Description: documentation for the openzwave library
@@ -44,7 +44,7 @@ Description: documentation for the openzwave library
  This package contains documentation.
 
 Package: openzwave
-Section: non-free/misc
+Section: misc
 Architecture: any
 Depends: libopenzwave1.5 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} 
 Description: Sample Program for libopenzwave 
diff --git a/debian/copyright b/debian/copyright
index e80f327..ce35822 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -97,6 +97,46 @@ License: AESBSD
  This software is provided 'as is' with no explicit or implied warranties
  in respect of its operation, including, but not limited to, correctness
  and fitness for purpose.
+Comment:
+ This license text is the official license text of Brian Gladman. The
+ term "is allowed without the payment of fees or royalties" shall make
+ it clear that this software is now available for free (as in beer)
+ and will always be. 
+ The rest of the license takes care of the free as in speech.
+ Nevertheless Brian permits others to distribute the software under
+ other licenses. Especially he allowed me to distribute the software
+ under the following conditions, which is the normal BSD license without
+ mentioning fees:
+ > /*
+ > ---------------------------------------------------------------------------
+ > Copyright (c) 1998-2013, Brian Gladman, Worcester, UK. All rights reserved.
+ > 
+ > The redistribution and use of this software (with or without changes)
+ > is allowed provided that:
+ > 
+ >    source code distributions include the above copyright notice, this
+ >    list of conditions and the following disclaimer;
+ > 
+ >    binary distributions include the above copyright notice, this list
+ >    of conditions and the following disclaimer in their documentation.
+ > 
+ > This software is provided 'as is' with no explicit or implied warranties
+ > in respect of its operation, including, but not limited to, correctness
+ > and fitness for purpose.
+ > ---------------------------------------------------------------------------
+ > */
+ .
+ Hi Thorsten,
+ .
+ I am content with this and would be happy for you to replace my current
+ license with is one on any files that you wish to use.
+ .
+ If you need a more formal agreement from me, I am sure we will be able
+ to find a way of achieving this.
+ .
+ best regards,
+ .
+ Brian
 
 License: TINY
  This software is provided 'as-is', without any express or implied

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave.git