Merge branch 'debian/latest' into debian/bookworm

debian/NEWS

@@ -0,0 +1,11 @@
+linbpq (6.0.24.22-2) UNRELEASED; urgency=medium
+
+  This is quite a big update, with config moving from /opt/oarc/bpq/bpq32.cfg to
+  /etc/bpq32.cfg. The system shall do this automatically for you, however
+  computers and their programmers are not perfect.
+
+  I strongly recommend at this point backing up your entire
+  /opt/oarc/bpq/ directory (cp -r /opt/oarc/bpq/ ~/bpq-backup/) before
+  proceeding with the upgrade
+
+ -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 13:30:06 +0000

debian/changelog

@@ -1,3 +1,9 @@
+linbpq (6.0.24.22-2) UNRELEASED; urgency=medium
+
+  * Moved config file home, caused chaos 
+
+ -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 13:30:06 +0000
+
 linbpq (6.0.24.22-1~bpo12+1) bookworm; urgency=medium
 
   * Rebuild for bookworm.

debian/dirs

@@ -1 +1,2 @@
+usr/sbin
 opt/oarc/bpq

debian/install

@@ -1 +1 @@
-debian/templates/bpq32.cfg opt/oarc/bpq
+debian/templates/bpq32.cfg etc/bpq32.cfg

debian/linbpq.service

@@ -2,7 +2,7 @@
 After=network.target
 
 [Service]
-ExecStart=/opt/oarc/bpq/linbpq
+ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/linbpq -l /opt/oarc/linbpq/logs
 WorkingDirectory=/opt/oarc/bpq
 Restart=always
 User=linbpq

debian/patches/makefile

@@ -8,8 +8,8 @@
 +#	setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
 +
 +install: 
-+	install -b -m 755  -D -d		debian/linbpq/opt/oarc/bpq
-+	install -b -m 755  -s -p linbpq		debian/linbpq/opt/oarc/bpq
++	install -b -m 755  -D -d		debian/usr/sbin
++	install -b -m 755  -s -p linbpq		debian/usr/sbin
  
  -include *.d
  

debian/preinst

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+confile="/etc/bpq32.cfg"
+node="/opt/oarc/bpq/bpq32.cfg"
+
+if [ -L $confile ]; then
+	rm $confile
+	cp $node $confile
+	rm $node
+fi