GitHub-Mirror/open-zwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/open-zwave.git synced 2025-03-15 11:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

try debian files

Browse source
This commit is contained in:
Justin Hammond 2019-05-07 13:34:29 +08:00
parent d4f9360bba
commit 95e71c0363
15 changed files with 80 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
debian/changelog vendored
View file

@ -1,5 +1,46 @@
openzwave (1.4+ds-1) unstable; urgency=medium
openzwave (1.5+ds-6) unstable; urgency=medium
* Initial release
* debian/control: use dh11
* debian/control: bump to version 4.1.5 (no changes)
* debian/control: usa salsa VCS URLs
* debian/control: add 'Suggests: libopenzwave-doc' to dev package
(Closes: #849606)
* add gcc8.patch to avoid FTBFS (Closes: #897828)
-- Justin Hammond <justin@dynam.ac> Thur, 16 July 2018 22:36:00 +0800
-- Thorsten Alteholz <debian@alteholz.de> Tue, 10 Jul 2018 19:20:00 +0200
openzwave (1.5+ds-5) unstable; urgency=medium
* debian/control: bump to version 4.0.1 (no changes)
* debian/control: use dh 10 now
* debian/rules: more compiler options to make gcc7 happy (Closes: #871088)
-- Thorsten Alteholz <debian@alteholz.de> Mon, 21 Aug 2017 19:20:00 +0200
openzwave (1.5+ds-4) unstable; urgency=medium
* move maintenance to debian-iot
-- Thorsten Alteholz <debian@alteholz.de> Fri, 23 Dec 2016 19:10:00 +0100
openzwave (1.5+ds-3) unstable; urgency=medium
* debian/control: add VCS URLs
* install modified tinyxml headers (Closes: #839281)
thanks to Dara Adib for the suggestion and the patch
-- Thorsten Alteholz <debian@alteholz.de> Mon, 12 Dec 2016 21:10:00 +0100
openzwave (1.5+ds-2) unstable; urgency=medium
* move from non-free to main
(comment in debian/copyright for AESBSD)
-- Thorsten Alteholz <debian@alteholz.de> Tue, 29 Nov 2016 21:10:00 +0100
openzwave (1.5+ds-1) unstable; urgency=medium
* Initial release (Closes: #791965)
(cannot be in main due to cpp/src/aes/*)
-- Thorsten Alteholz <debian@alteholz.de> Tue, 13 Sep 2016 18:10:00 +0200

2
debian/compat vendored
View file

@ -1 +1 @@
10
11

22
debian/control vendored
View file

@ -1,23 +1,25 @@
Source: openzwave
Maintainer: Justin Hammond <justin@dynam.ac>
Uploaders: Justin Hammond <justin@dynam.ac>
Maintainer: Debian IoT Maintainers <debian-iot-maintainers@lists.alioth.debian.org>
Uploaders: Thorsten Alteholz <debian@alteholz.de>
Section: devel
Priority: optional
Build-Depends: debhelper
Build-Depends: debhelper (>=11)
, dh-exec (>=0.2)
, g++ (>= 4.4)
, quilt
, libudev-dev
, libxml2-utils
, gcc, g++
, gcc-8, g++-8
, libtinyxml-dev
Standards-Version: 4.1.5
Homepage: http://www.openzwave.com/
Vcs-Browser: https://salsa.debian.org/debian-iot-team/openzwave
Vcs-Git: https://salsa.debian.org/debian-iot-team/openzwave.git
Package: libopenzwave1.4
Package: libopenzwave1.6
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libtinyxml
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
@ -26,9 +28,9 @@ Description: API to use a Z-Wave controller
.
This package contains the library.
Package: libopenzwave1.4-dev
Package: libopenzwave1.6-dev
Section: libdevel
Depends: ${misc:Depends}, libopenzwave1.4 (= ${binary:Version})
Depends: ${misc:Depends}, libopenzwave1.6 (= ${binary:Version})
Suggests: libopenzwave-doc
Architecture: any
Description: header files for the openzwave library
@ -54,7 +56,7 @@ Description: documentation for the openzwave library
Package: openzwave
Section: misc
Architecture: any
Depends: libopenzwave1.4 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Depends: libopenzwave1.6 (>= ${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

4
debian/libopenzwave-doc.doc-base vendored
View file

@ -7,5 +7,5 @@ Abstract: OpenZWave is a library which provides an API for applications
Section: Programming
Format: HTML
Index: /usr/share/doc/openzwave-1.4.0/default.htm
Files: /usr/share/doc/openzwave-1.4.0/*.htm
Index: /usr/share/doc/openzwave-1.6.0/default.htm
Files: /usr/share/doc/openzwave-1.6.0/*.htm

2
debian/libopenzwave-doc.lintian-overrides-not-needed vendored
View file

@ -1,2 +1,2 @@
# this is not jquery but some stuff added by doxygen
libopenzwave-doc: embedded-javascript-library usr/share/doc/openzwave-1.4.0/api/html/jquery.js please use libjs-jquery
libopenzwave-doc: embedded-javascript-library usr/share/doc/openzwave-1.6.0/api/html/jquery.js please use libjs-jquery

8
debian/libopenzwave1.4.lintian-overrides vendored
View file

@ -1,8 +0,0 @@
# this is a modified version
libopenzwave1.4: embedded-library usr/lib/*/libopenzwave.so.1.4: tinyxml
#due to arch- and optimisation-dependent symbols the symbols-file is not
#maintainable and FTBSs occur on lots of architectures
libopenzwave1.4: no-symbols-control-file
# this is a false positive
libopenzwave1.4: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libopenzwave.so.1.4 LengH Length

0
debian/libopenzwave1.4-dev.install → debian/libopenzwave1.6-dev.install vendored
View file

0
debian/libopenzwave1.4.install → debian/libopenzwave1.6.install vendored
View file

6
debian/libopenzwave1.6.lintian-overrides vendored Normal file
View file

@ -0,0 +1,6 @@
#due to arch- and optimisation-dependent symbols the symbols-file is not
#maintainable and FTBSs occur on lots of architectures
libopenzwave1.6: no-symbols-control-file
# this is a false positive
libopenzwave1.6: spelling-error-in-binary # usr/lib/x86_64-linux-gnu/libopenzwave.so.1.6 LengH Length

20
debian/openzwave.dsc vendored
View file

@ -1,8 +1,8 @@
Format: 3.0 (quilt)
Source: openzwave
Binary: libopenzwave1.4, libopenzwave1.4-dev, libopenzwave-doc, openzwave
Binary: libopenzwave1.6, libopenzwave1.6-dev, libopenzwave-doc, openzwave
Architecture: any all
Version: 1.4+ds-4
Version: 1.6+ds-4
Maintainer: justin@dynam.ac
Uploaders: justin@dynam.ac
Homepage: http://www.openzwave.com/
@ -12,15 +12,15 @@ Vcs-Git: https://anonscm.debian.org/git/debian-iot/openzwave.git
Build-Depends: debhelper (>= 9), dh-exec (>= 0.2), g++ (>= 4.4), quilt, libudev-dev, libxml2-utils
Package-List:
libopenzwave-doc deb doc optional arch=all
libopenzwave1.4 deb libs optional arch=any
libopenzwave1.4-dev deb libdevel optional arch=any
libopenzwave1.6 deb libs optional arch=any
libopenzwave1.6-dev deb libdevel optional arch=any
openzwave deb misc optional arch=any
Checksums-Sha1:
65fafb40a2efd63cc4f54e42a3968e29aa6d97a9 948050 openzwave_1.4+ds.orig.tar.gz
b150e03f58aab805535db7cf3e666a9827c87b11 7600 openzwave_1.4+ds-4.debian.tar.xz
65fafb40a2efd63cc4f54e42a3968e29aa6d97a9 948050 openzwave_1.6+ds.orig.tar.gz
b150e03f58aab805535db7cf3e666a9827c87b11 7600 openzwave_1.6+ds-4.debian.tar.xz
Checksums-Sha256:
e46322bbb7570003cb2d46b9062a02addc08effc45582e1221de6c7e4b30df56 948050 openzwave_1.4+ds.orig.tar.gz
8495ccaa5859b6378707d3bd2c4f76c12b72c245616e39621604ed53c44d42da 7600 openzwave_1.4+ds-4.debian.tar.xz
e46322bbb7570003cb2d46b9062a02addc08effc45582e1221de6c7e4b30df56 948050 openzwave_1.6+ds.orig.tar.gz
8495ccaa5859b6378707d3bd2c4f76c12b72c245616e39621604ed53c44d42da 7600 openzwave_1.6+ds-4.debian.tar.xz
Files:
63e765f96014f6877bcd34b462855f01 948050 openzwave_1.4+ds.orig.tar.gz
04e053edf2899486f4b1dd23503e8fe9 7600 openzwave_1.4+ds-4.debian.tar.xz
63e765f96014f6877bcd34b462855f01 948050 openzwave_1.6+ds.orig.tar.gz
04e053edf2899486f4b1dd23503e8fe9 7600 openzwave_1.6+ds-4.debian.tar.xz

26
debian/patches/cppflags.patch vendored
View file

@ -1,26 +0,0 @@
Author: Thorsten Alteholz <debian@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

40
debian/patches/gcc8.patch vendored
View file

@ -1,40 +0,0 @@
Description: avoid FTBFS with gcc8
Author: Thorsten Alteholz <debian@alteholz.de>
#Index: openzwave-1.5+ds/cpp/build/support.mk
#===================================================================
#--- openzwave-1.5+ds.orig/cpp/build/support.mk 2018-07-09 13:53:57.470848046 +0200
#+++ openzwave-1.5+ds/cpp/build/support.mk 2018-07-09 13:53:57.458848046 +0200
#@@ -50,9 +50,9 @@
# CXX := $(CROSS_COMPILE)c++
# LD := $(CROSS_COMPILE)c++
# else
#-CC := $(CROSS_COMPILE)gcc
#-CXX := $(CROSS_COMPILE)g++
#-LD := $(CROSS_COMPILE)g++
#+CC := $(CROSS_COMPILE)gcc-8
#+CXX := $(CROSS_COMPILE)g++-8
#+LD := $(CROSS_COMPILE)g++-8
# endif
# ifeq ($(UNAME),Darwin)
# AR := libtool -static -o
Index: openzwave-1.5+ds/cpp/src/command_classes/DoorLockLogging.cpp
===================================================================
--- openzwave-1.5+ds.orig/cpp/src/command_classes/DoorLockLogging.cpp 2018-07-09 13:53:57.470848046 +0200
+++ openzwave-1.5+ds/cpp/src/command_classes/DoorLockLogging.cpp 2018-07-09 14:46:19.842753846 +0200
@@ -304,12 +304,14 @@
}
uint8 userid = (_data[10]);
uint8 usercodelength = (_data[11]);
- char usercode[254];
+ #define USERCODESIZE 254
+ char usercode[USERCODESIZE], tmpusercode[USERCODESIZE+4];
snprintf(usercode, sizeof(usercode), "UserCode:");
if (usercodelength > 0)
for (int i = 0; i < usercodelength; i++ )
{
- snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]);
+ snprintf(tmpusercode, sizeof(tmpusercode), "%s %d", usercode, (int)_data[12+i]);
+ snprintf(usercode, USERCODESIZE, "%.253s",tmpusercode);
}
if (valid) {

2
debian/patches/series vendored
View file

@ -1,4 +1,2 @@
#hardening.patch
#spelling.patch
#cppflags.patch
#gcc8.patch

8
debian/rules vendored
View file

@ -39,16 +39,16 @@ override_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
LDFLAGS="$(LDFLAGS) $(MORELDFLAGS)" CPPFLAGS="$(CPPFLAGS) $(MORECPPFLAGS)" USE_HID=0 USE_BI_TXML=0 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
USE_HID=0 USE_BI_TXML=0 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.4/etc
mv debian/tmp/usr/etc/openzwave debian/libopenzwave1.4/etc/
install -d debian/libopenzwave1.6/etc
mv debian/tmp/usr/etc/openzwave debian/libopenzwave1.6/etc/
update_debian_version:
sed -i '1 s/(.*)/($(shell git describe --long --tags --dirty | sed s/-/./g | sed s/^v// ))/' debian/changelog

0
debian/shlibs.libopenzwave1.4 → debian/shlibs.libopenzwave1.6 vendored
View file