Control: tags -1 + patch

Attached is a fix for this issue.
A minimal one, and my preferred one (v2) using the --name option of dh_installinit/systemd.


Regards,
Michael

diff --git a/debian/gitaly.init b/debian/gitaly-installer.gitaly.init
similarity index 100%
rename from debian/gitaly.init
rename to debian/gitaly-installer.gitaly.init
diff --git a/debian/gitaly.service b/debian/gitaly-installer.gitaly.service
similarity index 100%
rename from debian/gitaly.service
rename to debian/gitaly-installer.gitaly.service
diff --git a/debian/rules b/debian/rules
index ad02dba..76a8563 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,8 @@
 %:
 	dh $@
 
-override_dh_install:
-	dh_install
-	# Install the systemd service file
-	install -D -m 644 debian/gitaly.service $(CURDIR)/debian/gitaly-installer/lib/systemd/system/gitaly.service
-	# Install the init script
-	install -D -m 755 debian/gitaly.init $(CURDIR)/debian/gitaly-installer/etc/init.d/gitaly
+override_dh_installinit:
+	dh_installinit -pgitaly-installer --name=gitaly
+
+override_dh_installsystemd:
+	dh_installsystemd -pgitaly-installer --name=gitaly
diff --git a/debian/rules b/debian/rules
index ad02dba..4583a9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,6 @@
 override_dh_install:
 	dh_install
 	# Install the systemd service file
-	install -D -m 644 debian/gitaly.service $(CURDIR)/debian/gitaly-installer/lib/systemd/system/gitaly.service
+	install -D -m 644 debian/gitaly.service $(CURDIR)/debian/gitaly-installer/usr/lib/systemd/system/gitaly.service
 	# Install the init script
 	install -D -m 755 debian/gitaly.init $(CURDIR)/debian/gitaly-installer/etc/init.d/gitaly

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to