Tested final release for new layout

debian/changelog

@@ -1,8 +1,8 @@
-linbpq (6.0.24.22-2) UNRELEASED; urgency=medium
+linbpq (6.0.24.22-2) unstable; urgency=medium
 
   * Moved config file home, caused chaos 
 
- -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 13:30:06 +0000
+ -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 14:40:20 +0000
 
 linbpq (6.0.24.22-1) unstable; urgency=medium
 

debian/conffiles

@@ -1 +0,0 @@
-/opt/oarc/bpq/bpq32.cfg

debian/install

@@ -1 +1 @@
-debian/templates/bpq32.cfg etc/bpq32.cfg
+debian/templates/bpq32.cfg etc/

debian/linbpq.links

@@ -1 +0,0 @@
-/opt/oarc/bpq/bpq32.cfg /etc/bpq32.cfg

debian/linbpq.service

@@ -2,7 +2,7 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/linbpq -l /opt/oarc/linbpq/logs
+ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/bpq -l /opt/oarc/bpq
 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/usr/sbin
-+	install -b -m 755  -s -p linbpq		debian/usr/sbin
++	install -b -m 755  -D -d		debian/linbpq/usr/sbin
++	install -b -m 755  -s -p linbpq		debian/linbpq/usr/sbin
  
  -include *.d
  

debian/postinst

@@ -26,7 +26,7 @@ if [ "$1" = configure ]; then
 # which allows us to install our binaries without the setuid
 # bit.     
 	if command -v setcap > /dev/null; then         
-			setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /opt/oarc/bpq/linbpq
+			setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /usr/sbin/linbpq
 		else
 			echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2
 	fi

debian/preinst

@@ -8,5 +8,5 @@ node="/opt/oarc/bpq/bpq32.cfg"
 if [ -L $confile ]; then
 	rm $confile
 	cp $node $confile
-	rm $node
+	mv $node $node.bak
 fi