Merge pull request #25 from paulgear/feature/rebuild-opt

Rebuild

Makefile

@@ -51,15 +51,10 @@ orig:	$(BUILDROOT)
 	if [ ! -f tarballs/$(NAME)_$(VERSION).orig.tar.gz ]; then \
 		cp $(BUILDROOT)/$(NAME)_$(VERSION).orig.tar.gz tarballs/; \
 	fi
+	cd $(BUILDROOT) && tar -xf $(NAME)_$(VERSION).orig.tar.gz
 
 package:	$(BUILDROOT)
-	cd $(BUILDROOT); \
-		tar -xf $(NAME)_$(VERSION).orig.tar.gz; \
-		cd $(NAME)-$(VERSION)/; \
-		debuild
+	cd $(BUILDROOT)/$(NAME)-$(VERSION)/ && debuild
 
 srcpackage:	$(BUILDROOT)
-	cd $(BUILDROOT); \
-		tar -xf $(NAME)_$(VERSION).orig.tar.gz; \
-		cd $(NAME)-$(VERSION)/; \
-		debuild -S
+	cd $(BUILDROOT)/$(NAME)-$(VERSION)/ && debuild -S

debian/changelog

@@ -1,3 +1,10 @@
+ntpmon (2.0.2+repack1-2) focal; urgency=medium
+
+  * Rebuild with /opt/ntpmon as install directory so as not to clash with
+    ntpsec's /usr/bin/ntpmon.
+
+ -- Paul Gear <[email protected]>  Fri, 06 Oct 2023 16:39:28 +1000
+
 ntpmon (2.0.2+repack1-1) focal; urgency=medium
 
   * No change rebuild.

debian/rules

@@ -7,7 +7,7 @@ NAME=ntpmon
 	dh $@ --with python3
 
 override_dh_auto_install:
-	$(MAKE) DESTDIR=$$(pwd)/debian/$(NAME) PREFIX=/usr install
+	$(MAKE) DESTDIR=$$(pwd)/debian/$(NAME) PREFIX=/opt/ntpmon install
 	rst2man debian/check_ntpmon-man.rst > debian/check_$(NAME).1
 	rst2man debian/ntpmon-man.rst > debian/$(NAME).8
 	dh_installman debian/check_$(NAME).1