[Debian-iot-packaging] [openzwave] 02/02: Import Debian patch 1.5+ds-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Sun Dec 4 17:56:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository openzwave.
commit 29076be1bdca664070b81145545c6a341f77d85b
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Tue Sep 13 18:10:00 2016 +0200
Import Debian patch 1.5+ds-1
---
debian/MinOZW.1 | 14 +++
debian/changelog | 6 ++
debian/compat | 1 +
debian/control | 54 ++++++++++
debian/copyright | 120 +++++++++++++++++++++
debian/format | 1 +
debian/libopenzwave-doc.doc-base | 11 ++
debian/libopenzwave-doc.install | 1 +
.../libopenzwave-doc.lintian-overrides-not-needed | 2 +
debian/libopenzwave1.5-dev.install | 2 +
debian/libopenzwave1.5.install | 2 +
debian/libopenzwave1.5.lintian-overrides | 8 ++
debian/libopenzwave1.5.triggers | 1 +
debian/openzwave.install | 1 +
debian/openzwave.manpages | 1 +
debian/patches/cppflags.patch | 26 +++++
debian/patches/hardening.patch | 77 +++++++++++++
debian/patches/series | 3 +
debian/patches/spelling.patch | 104 ++++++++++++++++++
debian/rules | 53 +++++++++
debian/shlibs.libopenzwave1.5 | 1 +
debian/source/format | 1 +
debian/version-increment.sh | 3 +
debian/watch | 6 ++
24 files changed, 499 insertions(+)
diff --git a/debian/MinOZW.1 b/debian/MinOZW.1
new file mode 100644
index 0000000..9f22aaa
--- /dev/null
+++ b/debian/MinOZW.1
@@ -0,0 +1,14 @@
+.TH OpenZWAVE 1
+.SH NAME
+MinOZW \- a small test application for libopenzwave
+.SH SYNOPSIS
+.nf
+.B MinOZW [port]
+.fi
+.
+.SH DESCRIPTION
+.rs
+.sp
+MinOZW is just a small example to test the openZWAVE library.
+The first argument is the port where the ZWAVE controller is attached to. The default value is /dev/ttyUSB0.
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..8109384
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+openzwave (1.5+ds-1) unstable; urgency=medium
+
+ * Initial release (Closes: #791965)
+ (cannot be in main due to cpp/src/aes/*)
+
+ -- Thorsten Alteholz <debian at alteholz.de> Tue, 13 Sep 2016 18:10:00 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..058fc16
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,54 @@
+Source: openzwave
+Maintainer: Thorsten Alteholz <debian at alteholz.de>
+Section: non-free/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
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: API to use a Z-Wave controller
+ OpenZWave is an open-source, cross-platform library designed to enable
+ anyone to add support for Z-Wave home-automation devices to their
+ applications, without requiring any in depth knowledge of the Z-Wave
+ protocol.
+ .
+ This package contains the library.
+
+Package: libopenzwave1.5-dev
+Section: non-free/libdevel
+Depends: ${misc:Depends}, libopenzwave1.5 (= ${binary:Version})
+Architecture: any
+Description: header files for the openzwave library
+ OpenZWave is an open-source, cross-platform library designed to enable
+ anyone to add support for Z-Wave home-automation devices to their
+ applications, without requiring any in depth knowledge of the Z-Wave
+ protocol.
+ .
+ This package contains files for developing.
+
+Package: libopenzwave-doc
+Section: non-free/doc
+Depends: ${misc:Depends}, libjs-jquery
+Architecture: all
+Description: documentation for the openzwave library
+ OpenZWave is an open-source, cross-platform library designed to enable
+ anyone to add support for Z-Wave home-automation devices to their
+ applications, without requiring any in depth knowledge of the Z-Wave
+ protocol.
+ .
+ This package contains documentation.
+
+Package: openzwave
+Section: non-free/misc
+Architecture: any
+Depends: libopenzwave1.5 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Sample Program for libopenzwave
+ OpenZWave is an open-source, cross-platform library designed to enable
+ anyone to add support for Z-Wave home-automation devices to their
+ applications, without requiring any in depth knowledge of the Z-Wave
+ protocol.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e80f327
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,120 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: open-zwave
+Upstream-Contact: Mal Lansell <openzwave at lansell.org>
+Source: https://github.com/OpenZWave/open-zwave
+Files-Excluded: cpp/hidapi/windows debian
+
+Files: *
+Copyright: 2010 Mal Lansell <openzwave at lansell.org>
+ 2011 Greg Satz <satz at iranger.com>
+ 2014 Justin Hammond <justin at dynam.ac>
+ 2010 Jason Frazier <frazierjason at gmail.com>
+ 2010 Amer Harb <harb_amer at hotmail.com>
+ 2015 Microsoft Corporation
+License: LGPL-3+
+
+Files: cpp/hidapi/*
+Copyright: 2010, Alan Ott, Signal 11 Software
+License: HIDAPIlicense or GPL-3 or OZBSD or OriginalHIDAPI
+
+Files: cpp/build/sh2ju.sh
+Copyright: 2010 Manuel Carrasco Moñino. (manolo at apache.org)
+License: Apache-2.0
+
+Files: cpp/src/aes/*
+Copyright: 1998-2013, Brian Gladman, Worcester, UK.
+License: AESBSD
+
+Files: cpp/tinyxml/*
+Copyright: Yves Berquin
+ 2000-2006, Lee Thomason (www.grinninglizard.com)
+ 2005, Tyge Lovset
+License: TINY
+
+License: HIDAPIlicense
+ HIDAPI can be used under one of three licenses.
+ .
+ 1. The GNU General Public License, version 3.0, in LICENSE-gpl3.txt (-> see GPL-3)
+ 2. A BSD-Style License, in LICENSE-bsd.txt. (-> see OZBSD)
+ 3. The more liberal original HIDAPI license. LICENSE-orig.txt (-> see OriginalHIDAPI)
+ .
+ The license chosen is at the discretion of the user of HIDAPI. For example:
+ 1. An author of GPL software would likely use HIDAPI under the terms of the
+ GPL.
+ .
+ 2. An author of commercial closed-source software would likely use HIDAPI
+ under the terms of the BSD-style license or the original HIDAPI license.
+
+License: Apache-2.0
+ /usr/share/common-licenses/Apache-2.0
+
+License: LGPL-3+
+ /usr/share/common-licenses/LGPL-3.0
+
+License: GPL-3
+ /usr/share/common-licenses/GPL-3.0
+
+License: OZBSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Signal 11 Software nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: OriginalHIDAPI
+ This software may be used by anyone for any reason so
+ long as the copyright notice in the source files
+ remains intact.
+
+License: AESBSD
+ The redistribution and use of this software (with or without changes)
+ is allowed without the payment of fees or royalties 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.
+
+License: TINY
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
diff --git a/debian/format b/debian/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/libopenzwave-doc.doc-base b/debian/libopenzwave-doc.doc-base
new file mode 100644
index 0000000..d998032
--- /dev/null
+++ b/debian/libopenzwave-doc.doc-base
@@ -0,0 +1,11 @@
+Document: libopenzwave
+Title: openZwave Library Documentation
+Author: Junichi Uekawa
+Abstract: OpenZWave is a library which provides an API for applications
+ to access and control a Z-Wave controller connected to the PC
+ via a serial or HID connection.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/openzwave-1.5.0/default.htm
+Files: /usr/share/doc/openzwave-1.5.0/*.htm
diff --git a/debian/libopenzwave-doc.install b/debian/libopenzwave-doc.install
new file mode 100644
index 0000000..60d7d3d
--- /dev/null
+++ b/debian/libopenzwave-doc.install
@@ -0,0 +1 @@
+usr/share/doc/openzwave*/*
diff --git a/debian/libopenzwave-doc.lintian-overrides-not-needed b/debian/libopenzwave-doc.lintian-overrides-not-needed
new file mode 100644
index 0000000..d393472
--- /dev/null
+++ b/debian/libopenzwave-doc.lintian-overrides-not-needed
@@ -0,0 +1,2 @@
+# this is not jquery but some stuff added by doxygen
+libopenzwave-doc: embedded-javascript-library usr/share/doc/openzwave-1.5.0/api/html/jquery.js please use libjs-jquery
diff --git a/debian/libopenzwave1.5-dev.install b/debian/libopenzwave1.5-dev.install
new file mode 100644
index 0000000..610952e
--- /dev/null
+++ b/debian/libopenzwave1.5-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libopenzwave.so
+usr/include/openzwave/*
diff --git a/debian/libopenzwave1.5.install b/debian/libopenzwave1.5.install
new file mode 100644
index 0000000..af22c8f
--- /dev/null
+++ b/debian/libopenzwave1.5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libopenzwave.so.*
+#etc/openzwave/*
diff --git a/debian/libopenzwave1.5.lintian-overrides b/debian/libopenzwave1.5.lintian-overrides
new file mode 100644
index 0000000..25b67ee
--- /dev/null
+++ b/debian/libopenzwave1.5.lintian-overrides
@@ -0,0 +1,8 @@
+# this is a modified version
+libopenzwave1.5: embedded-library usr/lib/*/libopenzwave.so.1.5: tinyxml
+#due to arch- and optimisation-dependent symbols the symbols-file is not
+#maintainable and FTBSs occur on lots of architectures
+libopenzwave1.5: no-symbols-control-file
+# this is a false positive
+libopenzwave1.5: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libopenzwave.so.1.5 LengH Length
+
diff --git a/debian/libopenzwave1.5.triggers b/debian/libopenzwave1.5.triggers
new file mode 100644
index 0000000..dd86603
--- /dev/null
+++ b/debian/libopenzwave1.5.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/debian/openzwave.install b/debian/openzwave.install
new file mode 100644
index 0000000..663c893
--- /dev/null
+++ b/debian/openzwave.install
@@ -0,0 +1 @@
+usr/bin/MinOZW
\ No newline at end of file
diff --git a/debian/openzwave.manpages b/debian/openzwave.manpages
new file mode 100644
index 0000000..49a3446
--- /dev/null
+++ b/debian/openzwave.manpages
@@ -0,0 +1 @@
+debian/MinOZW.1
diff --git a/debian/patches/cppflags.patch b/debian/patches/cppflags.patch
new file mode 100644
index 0000000..4951361
--- /dev/null
+++ b/debian/patches/cppflags.patch
@@ -0,0 +1,26 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: allow CPPFLAGS with spaces
+Index: openzwave/Makefile
+===================================================================
+--- openzwave.orig/Makefile 2016-09-05 13:49:48.000000000 +0200
++++ openzwave/Makefile 2016-09-05 13:50:31.000000000 +0200
+@@ -17,8 +17,8 @@
+ export PREFIX
+
+ all:
+- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
+- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
++ LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
++ LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
+
+ install:
+ $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+@@ -29,7 +29,7 @@
+ $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+
+ cpp/src/vers.cpp:
+- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp
++ LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp
+
+ check: xmltest
+
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..f5f3152
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,77 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: introduce hardening flags to Makefile
+Last-Updated: 2015-06-28
+
+Index: openzwave/Makefile
+===================================================================
+--- openzwave.orig/Makefile 2015-06-28 15:06:55.419193182 +0200
++++ openzwave/Makefile 2015-06-28 15:06:55.415193189 +0200
+@@ -17,8 +17,8 @@
+ export PREFIX
+
+ all:
+- $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
+- $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
++ CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
++ CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
+
+ install:
+ $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+@@ -29,7 +29,7 @@
+ $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+
+ cpp/src/vers.cpp:
+- $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp
++ CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp
+
+ check: xmltest
+
+@@ -55,4 +55,4 @@
+ DIST_FORMATS ?= gzip
+
+ include $(top_srcdir)/distfiles.mk
+-include $(top_srcdir)/dist.mk
+\ No newline at end of file
++include $(top_srcdir)/dist.mk
+Index: openzwave/cpp/build/Makefile
+===================================================================
+--- openzwave.orig/cpp/build/Makefile 2015-06-28 15:06:55.419193182 +0200
++++ openzwave/cpp/build/Makefile 2015-06-28 15:06:55.415193189 +0200
+@@ -34,6 +34,7 @@
+ else
+ LDFLAGS += -Wl,-soname,libopenzwave.so.$(VERSION)
+ LIBS += -ludev
++CFLAGS += $(CPPFLAGS)
+ endif
+
+ #where to put the temporary library
+Index: openzwave/cpp/examples/MinOZW/Makefile
+===================================================================
+--- openzwave.orig/cpp/examples/MinOZW/Makefile 2014-10-15 15:55:48.000000000 +0200
++++ openzwave/cpp/examples/MinOZW/Makefile 2015-06-28 15:08:06.855047366 +0200
+@@ -10,8 +10,8 @@
+ .PHONY: default clean
+
+
+-DEBUG_CFLAGS := -Wall -Wno-format -ggdb -DDEBUG
+-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O3
++DEBUG_CFLAGS := -Wall -Wno-format -ggdb -DDEBUG $(CPPFLAGS)
++RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O3 $(CPPFLAGS)
+
+ DEBUG_LDFLAGS := -g
+
+Index: openzwave/cpp/tinyxml/Makefile
+===================================================================
+--- openzwave.orig/cpp/tinyxml/Makefile 2014-10-15 15:55:46.000000000 +0200
++++ openzwave/cpp/tinyxml/Makefile 2015-06-28 15:07:34.591113079 +0200
+@@ -25,8 +25,8 @@
+ AR := ar rc
+ RANLIB := ranlib
+
+-DEBUG_CFLAGS := -Wall -Wno-format -g -DDEBUG
+-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O3
++DEBUG_CFLAGS := -Wall -Wno-format -g -DDEBUG $(CPPFLAGS)
++RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O3 $(CPPFLAGS)
+
+ LIBS :=
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9fbaf06
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+#hardening.patch
+spelling.patch
+cppflags.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..6dddae4
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,104 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: take care of spelling errors
+Last-Updated: 2015-06-06
+
+Index: openzwave/cpp/src/command_classes/DoorLock.cpp
+===================================================================
+--- openzwave.orig/cpp/src/command_classes/DoorLock.cpp 2016-09-05 12:31:52.000000000 +0200
++++ openzwave/cpp/src/command_classes/DoorLock.cpp 2016-09-05 12:31:52.000000000 +0200
+@@ -320,7 +320,7 @@
+ m_timeoutsecs = _data[4];
+ break;
+ default:
+- Log::Write(LogLevel_Warning, GetNodeId(), "Recieved a Unsupported Door Lock Config Report %d", _data[1]);
++ Log::Write(LogLevel_Warning, GetNodeId(), "Received a Unsupported Door Lock Config Report %d", _data[1]);
+ }
+
+ if( ValueByte* value = static_cast<ValueByte*>( GetValue( _instance, Value_System_Config_OutsideHandles ) ) )
+Index: openzwave/cpp/src/command_classes/DoorLockLogging.cpp
+===================================================================
+--- openzwave.orig/cpp/src/command_classes/DoorLockLogging.cpp 2016-09-05 12:31:52.000000000 +0200
++++ openzwave/cpp/src/command_classes/DoorLockLogging.cpp 2016-09-05 12:31:52.000000000 +0200
+@@ -281,7 +281,7 @@
+ if (EventType >= DoorLockEventType_Max)
+ EventType = DoorLockEventType_Max;
+
+- Log::Write (LogLevel_Info, GetNodeId(), "Recieved a DoorLockLogging Record %d which is \"%s\"", _data[1], c_DoorLockEventType[EventType-1]);
++ Log::Write (LogLevel_Info, GetNodeId(), "Received a DoorLockLogging Record %d which is \"%s\"", _data[1], c_DoorLockEventType[EventType-1]);
+
+ if( ValueByte* value = static_cast<ValueByte*>( GetValue( _instance, Value_GetRecordNo ) ) )
+ {
+Index: openzwave/cpp/src/command_classes/MultiInstance.cpp
+===================================================================
+--- openzwave.orig/cpp/src/command_classes/MultiInstance.cpp 2016-09-05 12:31:52.000000000 +0200
++++ openzwave/cpp/src/command_classes/MultiInstance.cpp 2016-09-05 12:31:52.000000000 +0200
+@@ -435,7 +435,7 @@
+ */
+ if ((m_ignoreUnsolicitedMultiChannelCapabilityReport && (node->GetCurrentQueryStage() != Node::QueryStage_Instances))
+ && !dynamic && m_endPointCommandClasses.size() > 0) {
+- Log::Write(LogLevel_Error, GetNodeId(), "Recieved a Unsolicited MultiChannelEncap when we are not in QueryState_Instances");
++ Log::Write(LogLevel_Error, GetNodeId(), "Received a Unsolicited MultiChannelEncap when we are not in QueryState_Instances");
+ return;
+ }
+
+@@ -685,7 +685,7 @@
+ pCommandClass->HandleMsg( &_data[4], _length-4, instance );
+ }
+ } else {
+- Log::Write(LogLevel_Error, GetNodeId(), "Recieved a MultiChannelEncap for endpoint %d for Command Class %d, which we can't find", endPoint, commandClassId);
++ Log::Write(LogLevel_Error, GetNodeId(), "Received a MultiChannelEncap for endpoint %d for Command Class %d, which we can't find", endPoint, commandClassId);
+ }
+ }
+ }
+Index: openzwave/cpp/src/Driver.cpp
+===================================================================
+--- openzwave.orig/cpp/src/Driver.cpp 2016-09-05 12:31:52.000000000 +0200
++++ openzwave/cpp/src/Driver.cpp 2016-09-05 12:31:52.000000000 +0200
+@@ -4398,7 +4398,7 @@
+ Log::Write(LogLevel_Info, _nodeId, "Network Key Not Set - Secure Option is %s", secure ? "required" : "not required");
+ m_nodes[_nodeId]->SetProtocolInfo(_protocolInfo, _length);
+ }
+- Log::Write(LogLevel_Info, _nodeId, "Initilizing Node. New Node: %s (%s)", static_cast<Node *>(m_nodes[_nodeId])->IsAddingNode() ? "true" : "false", newNode ? "true" : "false");
++ Log::Write(LogLevel_Info, _nodeId, "Initializing Node. New Node: %s (%s)", static_cast<Node *>(m_nodes[_nodeId])->IsAddingNode() ? "true" : "false", newNode ? "true" : "false");
+ }
+
+ //-----------------------------------------------------------------------------
+Index: openzwave/cpp/src/Node.cpp
+===================================================================
+--- openzwave.orig/cpp/src/Node.cpp 2016-09-05 12:31:52.000000000 +0200
++++ openzwave/cpp/src/Node.cpp 2016-09-05 12:31:52.000000000 +0200
+@@ -1843,7 +1843,7 @@
+ if( CommandClass* pCommandClass = GetCommandClass( _data[5] ) )
+ {
+ if (pCommandClass->IsSecured() && !encrypted) {
+- Log::Write( LogLevel_Warning, m_nodeId, "Recieved a Clear Text Message for the CommandClass %s which is Secured", pCommandClass->GetCommandClassName().c_str());
++ Log::Write( LogLevel_Warning, m_nodeId, "Received a Clear Text Message for the CommandClass %s which is Secured", pCommandClass->GetCommandClassName().c_str());
+ bool drop = true;
+ Options::Get()->GetOptionAsBool("EnforceSecureReception", &drop);
+ if (drop) {
+Index: openzwave/cpp/src/ZWSecurity.cpp
+===================================================================
+--- openzwave.orig/cpp/src/ZWSecurity.cpp 2016-09-05 12:31:52.000000000 +0200
++++ openzwave/cpp/src/ZWSecurity.cpp 2016-09-05 12:31:52.000000000 +0200
+@@ -284,7 +284,7 @@
+ PrintHex("Raw", e_buffer, e_length);
+
+ if (e_length < 19) {
+- Log::Write(LogLevel_Warning, _sendingNode, "Recieved a Encrypted Message that is too Short. Dropping it");
++ Log::Write(LogLevel_Warning, _sendingNode, "Received a Encrypted Message that is too Short. Dropping it");
+ return false;
+ }
+
+Index: openzwave/cpp/src/command_classes/Security.cpp
+===================================================================
+--- openzwave.orig/cpp/src/command_classes/Security.cpp 2016-01-11 16:02:44.000000000 +0100
++++ openzwave/cpp/src/command_classes/Security.cpp 2016-09-05 12:33:06.000000000 +0200
+@@ -295,7 +295,7 @@
+ case SecurityCmd_MessageEncap:
+ case SecurityCmd_MessageEncapNonceGet:
+ {
+- Log::Write(LogLevel_Warning, GetNodeId(), "Recieved a Security Message that should have been handled in the Driver");
++ Log::Write(LogLevel_Warning, GetNodeId(), "Received a Security Message that should have been handled in the Driver");
+ break;
+ }
+ default:
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..a67f6ac
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+#XXX: MORECPPFLAGS=-fPIE -pie
+MORECPPFLAGS=
+MORELDFLAGS:=-Wl,-z,now
+
+ifndef DESTDIR
+DESTDIR=$(CURDIR)/debian/tmp/
+endif
+
+DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[\[:digit:]]*://' -e 's/[-].*//')
+MAJOR := $(shell echo '$(VERSION)' | awk -F . {'print $$1'})
+MINOR := $(shell echo '$(VERSION)' | awk -F . {'print $$2'} | awk -F '+' {'print $$1'})
+REV := $(shell echo '$(VERSION)' | awk -F . {'print $$3'})
+ifeq ($(strip $(REV)),)
+ REV:=0
+endif
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR := /usr/lib/$(DEB_HOST_MULTIARCH)/
+
+%:
+ dh $@
+
+override_dh_clean:
+ rm -f ozw_config doxygen.log
+ dh_clean
+
+override_dh_auto_build:
+ echo "Build version: >$(MAJOR).$(MINOR).$(REV)<"
+ LDFLAGS="$(LDFLAGS) $(MORELDFLAGS)" CPPFLAGS="$(CPPFLAGS) $(MORECPPFLAGS)" VERSION_MAJ=$(MAJOR) VERSION_MIN=$(MINOR) VERSION_REV=$(REV) PREFIX=/usr SYSCONFDIR=/etc/openzwave instlibdir=$(LIBDIR) make
+
+override_dh_auto_install:
+ VERSION_MAJ=$(MAJOR) VERSION_MIN=$(MINOR) VERSION_REV=$(REV) DESTDIR=$(DESTDIR) PREFIX=/usr SYSCONFDIR=/etc/openzwave instlibdir=$(LIBDIR) make install
+ # install docs in /usr/share/doc/openzwave/, not openzwave-VERSION
+ install -d debian/libopenzwave-doc/usr/share/doc
+ ###mv debian/tmp/usr/share/doc/openzwave-1* debian/libopenzwave-doc/usr/share/doc/openzwave
+ # install config files in /etc/
+ install -d debian/libopenzwave1.5/etc
+ mv debian/tmp/usr/etc/openzwave debian/libopenzwave1.5/etc/
+
+update_debian_version:
+ sed -i '1 s/(.*)/($(shell git describe --long --tags --dirty | sed s/-/./g | sed s/^v// ))/' debian/changelog
+
+get-orig-source:
+ uscan --force-download --debug --repack
diff --git a/debian/shlibs.libopenzwave1.5 b/debian/shlibs.libopenzwave1.5
new file mode 100644
index 0000000..eb0d333
--- /dev/null
+++ b/debian/shlibs.libopenzwave1.5
@@ -0,0 +1 @@
+libopenzwave 1 libopenzwave (>= 1.2)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/version-increment.sh b/debian/version-increment.sh
new file mode 100755
index 0000000..14514d4
--- /dev/null
+++ b/debian/version-increment.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+dch -v ${1} "new package"
+dch -r "release"
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..abed98b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+version=3
+opts=repack,repacksuffix=+ds,\
+dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
+filenamemangle=s/.*\/[vV]?([\d\.-]+)\.tar\.gz/openzwave-$1.tar.gz/ \
+https://github.com/OpenZWave/open-zwave/releases \
+.*/archive/[vV]?([\d\.]+).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave.git
More information about the Debian-iot-packaging
mailing list