From b49a7e4eb2112b3dc92d63d8cab76e1a2c71eba0 Mon Sep 17 00:00:00 2001 From: Sebastian Marsching Date: Sat, 30 Sep 2017 18:28:27 +0200 Subject: [PATCH] Fix Debian build. --- debian/changelog.in | 2 +- debian/control | 36 ++-- debian/copyright | 2 +- debian/docs | 2 +- ...lient-dev.dirs => libopcuaclient-dev.dirs} | 0 debian/libopcuaclient-dev.install | 2 + .../{opcuaclient.dirs => libopcuaclient.dirs} | 0 debian/libopcuaclient.install | 1 + debian/libopcuacore-dev.install | 16 +- debian/libopcuacore.install | 4 +- ...col-dev.dirs => libopcuaprotocol-dev.dirs} | 0 debian/libopcuaprotocol-dev.install | 2 + ...cuaprotocol.dirs => libopcuaprotocol.dirs} | 0 debian/libopcuaprotocol.install | 1 + ...erver-dev.dirs => libopcuaserver-dev.dirs} | 0 debian/libopcuaserver-dev.install | 2 + .../{opcuaserver.dirs => libopcuaserver.dirs} | 0 debian/libopcuaserver.install | 1 + debian/opcuaclient-dev.install | 2 - debian/opcuaclient.install | 5 - debian/opcuaprotocol-dev.install | 2 - debian/opcuaprotocol.install | 3 - debian/opcuaserver-dev.install | 1 - debian/opcuaserver.init | 154 ------------------ debian/opcuaserver.install | 6 - 25 files changed, 45 insertions(+), 199 deletions(-) rename debian/{opcuaclient-dev.dirs => libopcuaclient-dev.dirs} (100%) create mode 100644 debian/libopcuaclient-dev.install rename debian/{opcuaclient.dirs => libopcuaclient.dirs} (100%) create mode 100644 debian/libopcuaclient.install rename debian/{opcuaprotocol-dev.dirs => libopcuaprotocol-dev.dirs} (100%) create mode 100644 debian/libopcuaprotocol-dev.install rename debian/{opcuaprotocol.dirs => libopcuaprotocol.dirs} (100%) create mode 100644 debian/libopcuaprotocol.install rename debian/{opcuaserver-dev.dirs => libopcuaserver-dev.dirs} (100%) create mode 100644 debian/libopcuaserver-dev.install rename debian/{opcuaserver.dirs => libopcuaserver.dirs} (100%) create mode 100644 debian/libopcuaserver.install delete mode 100644 debian/opcuaclient-dev.install delete mode 100644 debian/opcuaclient.install delete mode 100644 debian/opcuaprotocol-dev.install delete mode 100644 debian/opcuaprotocol.install delete mode 100644 debian/opcuaserver-dev.install delete mode 100644 debian/opcuaserver.init delete mode 100644 debian/opcuaserver.install diff --git a/debian/changelog.in b/debian/changelog.in index 858bec6d..da530a02 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,4 +1,4 @@ -opcuaserver (@PACKAGE_VERSION@) unstable; urgency=low +freeopcua (@PACKAGE_VERSION@) unstable; urgency=low * Release @PACKAGE_VERSION@ diff --git a/debian/control b/debian/control index 1a6c0319..e7aad827 100644 --- a/debian/control +++ b/debian/control @@ -1,35 +1,35 @@ -Source: opcuaserver +Source: freeopcua Section: net Priority: extra Maintainer: Alexander Rykovanov -Build-Depends: debhelper (>= 8.0.0), autotools-dev +Build-Depends: debhelper (>= 8.0.0), autotools-dev, cmake, libxml2-dev, libboost-system-dev, libboost-program-options-dev, libboost-filesystem-dev, libboost-thread-dev Standards-Version: 3.9.4 -Homepage: https://github.com/freeopcua/opcua-server -Vcs-Git: https://github.com/freeopcua/opcua-server.git +Homepage: https://github.com/FreeOpcUa/freeopcua +Vcs-Git: https://github.com/FreeOpcUa/freeopcua.git -Package: opcuaserver-dev +Package: libopcuaserver-dev Section: libdevel Architecture: amd64 i386 -Depends: opcuaserver (= ${binary:Version}), opcuaclient-dev (>= 0.1.3), libopcuacore-dev (>= 0.1.3), opcuaprotocol-dev (>= 0.2.0) +Depends: libopcuaserver (= ${binary:Version}), libopcuacore-dev (= ${binary:Version}), libopcuaprotocol-dev (= ${binary:Version}) Description: OPCUA server developer files. -Package: opcuaserver +Package: libopcuaserver Section: net Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends}, opcuaclient (>= 0.1.3), libopcuacore (= 0.1.3), opcuaprotocol (>= 0.2.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, libopcuacore (= ${binary:Version}), libopcuaprotocol (= ${binary:Version}) Description: OPCUA server. -Package: opcuaserver-doc +Package: libopcuaserver-doc Architecture: any Description: documentation for opcuaserver -Package: opcuaprotocol-dev +Package: libopcuaprotocol-dev Section: libdevel Architecture: amd64 i386 -Depends: opcuaprotocol (= ${binary:Version}) +Depends: libopcuaprotocol (= ${binary:Version}) Description: OPCUA protocol developer files. -Package: opcuaprotocol +Package: libopcuaprotocol Section: libs Architecture: amd64 i386 Depends: ${shlibs:Depends}, ${misc:Depends} @@ -38,24 +38,24 @@ Description: OPCUA protocols. Package: libopcuacore-dev Section: libdevel Architecture: amd64 i386 -Depends: libopcuacore (= ${binary:Version}), libboost-system-dev, libboost-filesystem-dev, opcuaprotocol-dev (>= 0.2.0) +Depends: libopcuacore (= ${binary:Version}), libboost-system-dev, libboost-filesystem-dev, libopcuaprotocol-dev (= ${binary:Version}) Description: OPCUA core infrastructure developer files. Package: libopcuacore Section: libs Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends}, opcuaprotocol (>= 0.2.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, libopcuaprotocol (= ${binary:Version}) Description: OPCUA core infrastructure. -Package: opcuaclient-dev +Package: libopcuaclient-dev Section: libdevel Architecture: amd64 i386 -Depends: opcuaclient (= ${binary:Version}), libopcuacore-dev (>= 0.1.3), opcuaprotocol-dev (>= 0.2.0), libboost-system-dev +Depends: libopcuaclient (= ${binary:Version}), libopcuacore-dev (= ${binary:Version}), libopcuaprotocol-dev (= ${binary:Version}), libboost-system-dev Description: OPCUA client developer files. -Package: opcuaclient +Package: libopcuaclient Section: libs Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends}, libopcuacore (>= 0.1.3), opcuaprotocol (>= 0.2.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, libopcuacore (= ${binary:Version}), libopcuaprotocol (= ${binary:Version}) Description: OPCUA client. diff --git a/debian/copyright b/debian/copyright index 69030d7c..693048a4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: opcuaserver +Upstream-Name: freeopcua source: https://github.com/treww/opcua-server/archive/master.zip Files: * diff --git a/debian/docs b/debian/docs index 50bd824b..8913f468 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ NEWS -README +README.md diff --git a/debian/opcuaclient-dev.dirs b/debian/libopcuaclient-dev.dirs similarity index 100% rename from debian/opcuaclient-dev.dirs rename to debian/libopcuaclient-dev.dirs diff --git a/debian/libopcuaclient-dev.install b/debian/libopcuaclient-dev.install new file mode 100644 index 00000000..69ce47de --- /dev/null +++ b/debian/libopcuaclient-dev.install @@ -0,0 +1,2 @@ +usr/include/opc/ua/client/* +usr/lib/*/pkgconfig/libopcuaclient.pc diff --git a/debian/opcuaclient.dirs b/debian/libopcuaclient.dirs similarity index 100% rename from debian/opcuaclient.dirs rename to debian/libopcuaclient.dirs diff --git a/debian/libopcuaclient.install b/debian/libopcuaclient.install new file mode 100644 index 00000000..f30803e6 --- /dev/null +++ b/debian/libopcuaclient.install @@ -0,0 +1 @@ +usr/lib/*/libopcuaclient.so* diff --git a/debian/libopcuacore-dev.install b/debian/libopcuacore-dev.install index 331c2ba3..53dc7564 100644 --- a/debian/libopcuacore-dev.install +++ b/debian/libopcuacore-dev.install @@ -1,2 +1,14 @@ -usr/include/* -usr/share/pkgconfig/* +usr/include/opc/common/* +usr/include/opc/spdlog/* +usr/include/opc/ua/connection_listener.h +usr/include/opc/ua/errors.h +usr/include/opc/ua/event.h +usr/include/opc/ua/global.h +usr/include/opc/ua/model.h +usr/include/opc/ua/node.h +usr/include/opc/ua/server_operations.h +usr/include/opc/ua/services/* +usr/include/opc/ua/socket_channel.h +usr/include/opc/ua/subscription.h +usr/lib/cmake/FreeOpcUa/* +usr/lib/*/pkgconfig/libopcuacore.pc diff --git a/debian/libopcuacore.install b/debian/libopcuacore.install index 234e738b..481d0dd0 100644 --- a/debian/libopcuacore.install +++ b/debian/libopcuacore.install @@ -1,3 +1 @@ -usr/lib/lib*.a -usr/lib/lib*.so* - +usr/lib/*/libopcuacore.so* diff --git a/debian/opcuaprotocol-dev.dirs b/debian/libopcuaprotocol-dev.dirs similarity index 100% rename from debian/opcuaprotocol-dev.dirs rename to debian/libopcuaprotocol-dev.dirs diff --git a/debian/libopcuaprotocol-dev.install b/debian/libopcuaprotocol-dev.install new file mode 100644 index 00000000..58c6365b --- /dev/null +++ b/debian/libopcuaprotocol-dev.install @@ -0,0 +1,2 @@ +usr/include/opc/ua/protocol/* +usr/lib/*/pkgconfig/libopcuaprotocol.pc diff --git a/debian/opcuaprotocol.dirs b/debian/libopcuaprotocol.dirs similarity index 100% rename from debian/opcuaprotocol.dirs rename to debian/libopcuaprotocol.dirs diff --git a/debian/libopcuaprotocol.install b/debian/libopcuaprotocol.install new file mode 100644 index 00000000..277d5137 --- /dev/null +++ b/debian/libopcuaprotocol.install @@ -0,0 +1 @@ +usr/lib/*/libopcuaprotocol.so* diff --git a/debian/opcuaserver-dev.dirs b/debian/libopcuaserver-dev.dirs similarity index 100% rename from debian/opcuaserver-dev.dirs rename to debian/libopcuaserver-dev.dirs diff --git a/debian/libopcuaserver-dev.install b/debian/libopcuaserver-dev.install new file mode 100644 index 00000000..664e69cc --- /dev/null +++ b/debian/libopcuaserver-dev.install @@ -0,0 +1,2 @@ +usr/include/opc/ua/server/* +usr/lib/*/pkgconfig/libopcuaserver.pc diff --git a/debian/opcuaserver.dirs b/debian/libopcuaserver.dirs similarity index 100% rename from debian/opcuaserver.dirs rename to debian/libopcuaserver.dirs diff --git a/debian/libopcuaserver.install b/debian/libopcuaserver.install new file mode 100644 index 00000000..1370cbb6 --- /dev/null +++ b/debian/libopcuaserver.install @@ -0,0 +1 @@ +usr/lib/*/libopcuaserver.so* diff --git a/debian/opcuaclient-dev.install b/debian/opcuaclient-dev.install deleted file mode 100644 index 331c2ba3..00000000 --- a/debian/opcuaclient-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/* -usr/share/pkgconfig/* diff --git a/debian/opcuaclient.install b/debian/opcuaclient.install deleted file mode 100644 index b1b772f2..00000000 --- a/debian/opcuaclient.install +++ /dev/null @@ -1,5 +0,0 @@ -etc/opcua/client/opc_tcp.conf -usr/bin/opcua -usr/lib/lib*.a -usr/lib/lib*.so* - diff --git a/debian/opcuaprotocol-dev.install b/debian/opcuaprotocol-dev.install deleted file mode 100644 index ead0c9ce..00000000 --- a/debian/opcuaprotocol-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/protocol/* -usr/share/pkgconfig/libopcuaprotocol.pc diff --git a/debian/opcuaprotocol.install b/debian/opcuaprotocol.install deleted file mode 100644 index b43ab38a..00000000 --- a/debian/opcuaprotocol.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libopcuaprotocol.a -usr/lib/libopcuaprotocol.so* - diff --git a/debian/opcuaserver-dev.install b/debian/opcuaserver-dev.install deleted file mode 100644 index 45636cee..00000000 --- a/debian/opcuaserver-dev.install +++ /dev/null @@ -1 +0,0 @@ -usr/include/server/* diff --git a/debian/opcuaserver.init b/debian/opcuaserver.init deleted file mode 100644 index aa7b815b..00000000 --- a/debian/opcuaserver.init +++ /dev/null @@ -1,154 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: opcuaserver -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Opc UA server -# Description: This is a script for managing opcua server -# placed in /etc/init.d. -### END INIT INFO - -# Author: Alexander Rykovanov -# - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OPC UA server" -NAME=opcuaserver -DAEMON=/usr/bin/$NAME -DAEMON_ARGS="--daemon" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --name $NAME --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --name $NAME --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=TERM/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/opcuaserver.install b/debian/opcuaserver.install deleted file mode 100644 index aad06931..00000000 --- a/debian/opcuaserver.install +++ /dev/null @@ -1,6 +0,0 @@ -etc/opcua/server/main.conf -usr/bin/opcuaserver -usr/lib/libopcuaserver.a -usr/lib/libopcuaserver.so* -usr/share/pkgconfig/libopcuaprotocol.pc -