distro UPDATE major package script update

Author: michalvasko

distro/pkg/deb/control

@@ -4,7 +4,7 @@ Maintainer: Michal Vaško <mvasko@cesnet.cz>
 Priority: optional
 Standards-Version: 4.5.1.0
 Build-Depends: cmake,
-               debhelper-compat (>= 12),
+               debhelper-compat (= 12),
                graphviz,
                libcmocka-dev,
                libsystemd-dev,
@@ -14,12 +14,11 @@ Build-Depends: cmake,
                libsysrepo-dev (>= 2.0.0),
                libyang2-dev (>= 2.0.0),
                pkg-config,
-               sysrepo-tools (>= 2.0.0) | sysrepo (>= 2.0.0)
+               sysrepo-tools (>= 2.0.0)
 Homepage: https://github.com/CESNET/netopeer2/
 
 Package: netopeer2
 Depends: openssl,
-         sysrepo (>= 2.2.95-1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Section: admin

distro/pkg/deb/netopeer2.install

@@ -1,9 +1,7 @@
-scripts/merge_config.sh /usr/share/netopeer2/
-scripts/merge_hostkey.sh /usr/share/netopeer2/
-scripts/remove.sh /usr/share/netopeer2/
-scripts/setup.sh /usr/share/netopeer2/
 usr/bin/netopeer2-cli
-usr/bin/netopeer2-server
+usr/sbin/netopeer2-server
 usr/share/man/man1/netopeer2-cli.1
 usr/share/man/man8/netopeer2-server.8
+usr/lib/systemd/system/netopeer2-server.service
 usr/share/yang/modules/netopeer2
+usr/share/netopeer2

distro/pkg/deb/netopeer2.postinst

@@ -29,14 +29,14 @@ case "$1" in
 	    NP2_MODULE_PERMS=660 \
 	    NP2_MODULE_OWNER=root \
 	    NP2_MODULE_GROUP=netconf \
-	    bash -r /usr/share/netopeer2/setup.sh
+	    bash /usr/share/netopeer2/setup.sh
 	env - \
 	    SYSREPOCFG_EXECUTABLE=sysrepocfg \
 	    OPENSSL_EXECUTABLE=openssl \
-	bash -r /usr/share/netopeer2/merge_hostkey.sh
+	bash /usr/share/netopeer2/merge_hostkey.sh
 	env - \
 	    SYSREPOCFG_EXECUTABLE=sysrepocfg \
-	bash -r /usr/share/netopeer2/merge_config.sh
+	bash /usr/share/netopeer2/merge_config.sh
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

distro/pkg/deb/netopeer2.postrm renamed to distro/pkg/deb/netopeer2.prerm

@@ -1,19 +1,19 @@
 #!/bin/sh
-# postrm script for netopeer2
+# prerm script for netopeer2
 #
 # see: dh_installdeb(1)
 
 set -e
 
 # summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
+#        * <prerm> `remove'
+#        * <prerm> `purge'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <new-prerm> `abort-install'
+#        * <new-prerm> `abort-install' <old-version>
+#        * <new-prerm> `abort-upgrade' <old-version>
+#        * <disappearer's-prerm> `disappear' <overwriter>
 #          <overwriter-version>
 # for details, see https://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
@@ -34,13 +34,13 @@ case "$1" in
 	    NP2_MODULE_PERMS=660 \
 	    NP2_MODULE_OWNER=root \
 	    NP2_MODULE_GROUP=netconf \
-	    bash -r /usr/share/netopeer2/remove.sh
+	    bash /usr/share/netopeer2/remove.sh
     ;;
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 
     *)
-        echo "postrm called with unknown argument \`$1'" >&2
+        echo "prerm called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac

distro/pkg/rpm/netopeer2-server.service

@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=notify
-ExecStart=/usr/bin/netopeer2-server -d -v 1
+ExecStart=/usr/sbin/netopeer2-server -d -v 1
 PIDFile=/run/netopeer2-server.pid
 PrivateTmp=yes
 PrivateDevices=yes

distro/pkg/rpm/netopeer2.spec

@@ -101,7 +101,7 @@ set -e
 %{_datadir}/man/man8/netopeer2-server.8.gz
 %{_unitdir}/netopeer2-server.service
 %{_datadir}/yang/modules/netopeer2/*.yang
-%{_datadir}/netopeer2/scripts/*.sh
+%{_datadir}/netopeer2/*.sh
 %dir %{_datadir}/yang/modules/netopeer2/
 %dir %{_datadir}/netopeer2/
 %dir %{_libdir}/netopeer2-server/