From 0e3216827a5c17dac09951f80f17edffea7f6d45 Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Tue, 30 Jun 2015 13:26:23 -0700 Subject: [PATCH 1/4] Pull in Debian fixes --- debian/compat | 2 +- debian/control | 67 +++++++++++--- debian/dirs | 2 - debian/{ola-dev.dirs => libola-dev.dirs} | 0 debian/libola-dev.install | 6 ++ debian/libola1.install | 5 + debian/ola-dev.install | 5 - debian/ola-python.install | 4 +- debian/ola-rdm-tests.install | 4 +- debian/ola.install | 2 - debian/rules | 113 ++--------------------- debian/source/format | 1 + debian/source/lintian-overrides | 7 ++ debian/source/local-options | 1 + 14 files changed, 88 insertions(+), 131 deletions(-) delete mode 100644 debian/dirs rename debian/{ola-dev.dirs => libola-dev.dirs} (100%) create mode 100644 debian/libola-dev.install create mode 100644 debian/libola1.install delete mode 100644 debian/ola-dev.install create mode 100644 debian/source/format create mode 100644 debian/source/lintian-overrides create mode 100644 debian/source/local-options diff --git a/debian/compat b/debian/compat index 7f8f011eb7..ec635144f6 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 5bccf8a866..0496816426 100644 --- a/debian/control +++ b/debian/control @@ -1,43 +1,63 @@ Source: ola Priority: extra -Maintainer: RenZO -Build-Depends: debhelper (>= 7), autotools-dev, bash-completion, automake, libftdi-dev, libusb-dev, libprotobuf-dev, python-dev, libmicrohttpd-dev, protobuf-compiler, uuid-dev, bison, flex, libcppunit-dev, python-protobuf, libprotoc-dev -Standards-Version: 3.9.1 +Maintainer: Wouter Verhelst +Uploaders: RenZO +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libslp-dev, libmicrohttpd-dev +Standards-Version: 3.9.5 Section: libs Vcs-Git: https://github.com/OpenLightingProject/ola.git Vcs-browser: https://github.com/OpenLightingProject/ola Homepage: https://www.openlighting.org/ -Package: ola-dev +Package: libola-dev Section: libdevel Architecture: any Depends: ola (= ${binary:Version}), ${misc:Depends} -Description: Open Lighting Architecture +Description: Open Lighting Architecture - development libraries + The DMX512 standard for Digital MultipleX is used for digital + communication networks commonly used to control stage lighting and + effects. + . The Open Lighting Architecture (OLA) provides a plugin framework for distributing DMX512 control signals on Mac and Linux. . - OLA is written and maintained by Simon Newton + This package contains the development files for libola and various related + libraries, used to write plugins or control the OLA daemon. Package: ola-python Section: libs Architecture: all -Depends: ola (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, python-protobuf -Description: OLA Python Classes +Depends: ola (>= ${source:Version}), ola (<< ${source:Version}.~), ${python:Depends}, ${misc:Depends}, python-protobuf +Description: Open Lighting Architecture - Python Classes + The DMX512 standard for Digital MultipleX is used for digital + communication networks commonly used to control stage lighting and + effects. + . The Open Lighting Architecture (OLA) provides a plugin framework for distributing DMX512 control signals on Mac and Linux. . - OLA is written and maintained by Simon Newton + This package contains the files required for plugins or to control the OLA + daemon from python. Package: ola-rdm-tests Section: libs Architecture: all -Depends: ola (= ${binary:Version}), ola-python (= ${binary:Version}), ${python:Depends}, ${misc:Depends} +Depends: ola (>= ${source:Version}), ola (<< ${source:Version}.~), ola-python (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, libjs-jquery, libjs-jquery-ui Suggests: bash-completion -Description: OLA RDM Responder Tests +Description: Open Lighting Architecture - RDM Responder Tests + The DMX512 standard for Digital MultipleX is used for digital + communication networks commonly used to control stage lighting and + effects. + . + The Remote Device Management protocol is an extension to DMX512, + allowing bi-directional communication between RDM-compliant devices + without disturbing other devices on the same connection. + . The Open Lighting Architecture (OLA) provides a plugin framework for distributing DMX512 control signals on Mac and Linux. . - OLA is written and maintained by Simon Newton + This package provides an automated way to check protocol compliance in + RDM devices. Package: ola Section: electronics @@ -45,7 +65,28 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Suggests: bash-completion Description: Open Lighting Architecture + The DMX512 standard for Digital MultipleX is used for digital + communication networks commonly used to control stage lighting and + effects. + . + The Open Lighting Architecture (OLA) provides a plugin framework for + distributing DMX512 control signals on Mac and Linux. + . + This package contains olad, the OLA daemon used to control lighting, + and a number of command-line tools to control and manipulate olad. + +Package: libola1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Open Lighting Architecture - shared libraries + The DMX512 standard for Digital MultipleX is used for digital + communication networks commonly used to control stage lighting and + effects. + . The Open Lighting Architecture (OLA) provides a plugin framework for distributing DMX512 control signals on Mac and Linux. . - OLA is written and maintained by Simon Newton + This package contains the shared libraries required to communicate with + olad. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bbb78..0000000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/ola-dev.dirs b/debian/libola-dev.dirs similarity index 100% rename from debian/ola-dev.dirs rename to debian/libola-dev.dirs diff --git a/debian/libola-dev.install b/debian/libola-dev.install new file mode 100644 index 0000000000..a95307012a --- /dev/null +++ b/debian/libola-dev.install @@ -0,0 +1,6 @@ +usr/include/* +usr/lib/*/pkgconfig/* +usr/lib/*/libola*.so +usr/lib/*/libola*.a +usr/lib/*/libola*.so +usr/lib/*/libola*.a diff --git a/debian/libola1.install b/debian/libola1.install new file mode 100644 index 0000000000..07c88cea0d --- /dev/null +++ b/debian/libola1.install @@ -0,0 +1,5 @@ +usr/lib/*/libola*.so.? +usr/lib/*/libola*.so.?.?.* +usr/lib/*/libola*.so.? +usr/lib/*/libola*.so.?.?.* + diff --git a/debian/ola-dev.install b/debian/ola-dev.install deleted file mode 100644 index d91f11bc97..0000000000 --- a/debian/ola-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/include/* -usr/lib/pkgconfig/* -usr/lib/libola*.so -usr/lib/libola*.la -usr/lib/libola*.a diff --git a/debian/ola-python.install b/debian/ola-python.install index d66d097576..101c36fe15 100644 --- a/debian/ola-python.install +++ b/debian/ola-python.install @@ -1,2 +1,2 @@ -usr/lib/python*/{dist,site}-packages/ola/*.py -usr/lib/python*/{dist,site}-packages/ola/rpc/*.py +usr/lib/python*/dist-packages/ola/*.py +usr/lib/python*/dist-packages/ola/rpc/*.py diff --git a/debian/ola-rdm-tests.install b/debian/ola-rdm-tests.install index 55fa394434..cb7ddd9f84 100644 --- a/debian/ola-rdm-tests.install +++ b/debian/ola-rdm-tests.install @@ -1,5 +1,5 @@ usr/bin/*.py -usr/lib/python*/{dist,site}-packages/ola/testing/*.py -usr/lib/python*/{dist,site}-packages/ola/testing/rdm/*.py +usr/lib/python*/dist-packages/ola/testing/*.py +usr/lib/python*/dist-packages/ola/testing/rdm/*.py usr/share/ola/rdm-server/* usr/share/ola/rdm-server/images/* diff --git a/debian/ola.install b/debian/ola.install index 2ea61f831a..1e8714b84c 100644 --- a/debian/ola.install +++ b/debian/ola.install @@ -1,8 +1,6 @@ usr/bin/ola* usr/bin/rdmpro_sniffer usr/bin/usbpro_firmware -usr/lib/libola*.so.? -usr/lib/libola*.so.?.?.* usr/share/olad/* usr/share/ola/pids/* usr/share/man/man1/* diff --git a/debian/rules b/debian/rules index 18cecae616..a1a969229b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,112 +8,17 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export VERBOSE=1 +%: + dh $@ --parallel --with autotools_dev,autoreconf,bash_completion,python2 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif +override_dh_auto_configure: + dh_auto_configure -- --enable-python-libs --enable-rdm-tests +override_dh_installinit: + dh_installinit -p ola --name=olad + dh_installinit -p ola-rdm-tests --name=rdm_test_server - - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -config.status: configure - dh_testdir - # Add here commands to configure the package. -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - ./configure $(CROSS) --enable-python-libs --enable-rdm-tests --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" - - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install --list-missing -# dh_installmenu - dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime - dh_installinit --name=olad - dh_installinit --name=rdm_test_server - dh_installudev --noscripts -# dh_installcron -# dh_installman -# Work around http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680852 -# By running it on each package one at a time. Would otherwise need a file -# containing one line, saying to install another file, but could then just use -# dh_bash-completion - dh_bash-completion -p ola - dh_bash-completion -p ola-rdm-tests - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl - dh_python2 +override_dh_makeshlibs: dh_makeshlibs -V - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000000..2981991d88 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,7 @@ +# Source for these files is all under /javascript +ola source: source-is-missing olad/www/mobile.js +ola source: source-is-missing olad/www/ola.js +# We don't use these +ola source: source-is-missing tools/rdm/static/jquery-1.7.2.min.js +ola source: source-is-missing tools/rdm/static/jquery-ui-1.8.21.custom.min.js + diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000000..7423a2df3d --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +single-debian-patch From 1aaa3572d14220b511bbd012f91814866ada597a Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Tue, 30 Jun 2015 15:07:57 -0700 Subject: [PATCH 2/4] Update debian/Makefile.am --- debian/Makefile.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/Makefile.mk b/debian/Makefile.mk index 84975721ab..87836c663d 100644 --- a/debian/Makefile.mk +++ b/debian/Makefile.mk @@ -4,24 +4,24 @@ EXTRA_DIST += \ debian/compat \ debian/control \ debian/copyright \ - debian/dirs \ - debian/ola-dev.dirs \ - debian/ola-dev.install \ + debian/libola-dev.dirs \ + debian/libola-dev.install \ + debian/libola1.install \ debian/ola-python.dirs \ debian/ola-python.install \ debian/ola-rdm-tests.bash-completion \ debian/ola-rdm-tests.config \ debian/ola-rdm-tests.dirs \ - debian/ola-rdm-tests.rdm_test_server.init \ debian/ola-rdm-tests.install \ debian/ola-rdm-tests.postinst \ + debian/ola-rdm-tests.rdm_test_server.init \ debian/ola-rdm-tests.templates \ debian/ola.bash-completion \ debian/ola.config \ debian/ola.dirs \ debian/ola.docs \ - debian/ola.olad.init \ debian/ola.install \ + debian/ola.olad.init \ debian/ola.postinst \ debian/ola.templates \ debian/ola.udev \ From ba7f419c6f3cbf114d1fecd599f047d13215d412 Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Tue, 30 Jun 2015 15:11:45 -0700 Subject: [PATCH 3/4] Remove libslp-dev from the debian build-depends --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 0496816426..4f23a44628 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ola Priority: extra Maintainer: Wouter Verhelst Uploaders: RenZO -Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libslp-dev, libmicrohttpd-dev +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev Standards-Version: 3.9.5 Section: libs Vcs-Git: https://github.com/OpenLightingProject/ola.git From 16cd43f89ee8a2e4e004567a0e723631407e9a63 Mon Sep 17 00:00:00 2001 From: Simon Newton Date: Tue, 30 Jun 2015 15:29:18 -0700 Subject: [PATCH 4/4] Update the Debian changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c086d814f6..7122ba0662 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ola (0.9.6-1) unstable; urgency=medium + + * New upstream release + + -- Simon Newton Tue, 30 Jun 2015 15:08:57 -0700 + ola (0.9.5-1) unstable; urgency=low * New upstream release