From 14d3cdfe58725fcfc42606e044c0558d0a0bc8b2 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Fri, 28 May 2021 12:33:52 -0400
Subject: [PATCH] Hopefully fix some Debian problems

---
 .gitignore        | 7 ++++---
 RoboFile.php      | 4 ++--
 dist/arsse        | 2 +-
 dist/debian/rules | 7 +++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index bea34346..b4883827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
 # Temporary files
 
+/temp/
 /documentation/
 /manual/
 /tests/coverage/
-/dist/arch/arsse
-/dist/arch/src
-/dist/arch/pkg
+/dist/arch/arsse/
+/dist/arch/src/
+/dist/arch/pkg/
 /arsse.db*
 /config.php
 /.php_cs.cache
diff --git a/RoboFile.php b/RoboFile.php
index 00883f76..fefd24dc 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -254,7 +254,7 @@ class RoboFile extends \Robo\Tasks {
         }
         // start a task collection and create a temporary directory
         $t = $this->collectionBuilder();
-        $dir = $t->tmpDir().\DIRECTORY_SEPARATOR;
+        $dir = $t->workDir(BASE."temp").\DIRECTORY_SEPARATOR;
         $base = $dir."arsse-$version".\DIRECTORY_SEPARATOR;
         // start by extracting the tarball
         $t->addCode(function() use ($tarball, $dir, $base) {
@@ -266,7 +266,7 @@ class RoboFile extends \Robo\Tasks {
         $t->addTask($this->taskPack($dir."arsse_$version.orig.tar.gz")->addDir("arsse-$version", $base));
         // copy Debian files to lower down in the tree
         $t->addTask($this->taskFilesystemStack()->mirror($base."dist/debian", $base."debian"));
-        $t->addTask($this->taskExec("deber")->dir($dir));
+        $t->addTask($this->taskExec("deber")->dir($base));
         return $t->run();
     }
 
diff --git a/dist/arsse b/dist/arsse
index b4c56e4a..987c1596 100644
--- a/dist/arsse
+++ b/dist/arsse
@@ -1,4 +1,4 @@
-#! /usr/bin/php
+#! /usr/bin/env php
 <?php
 if (posix_geteuid() == 0) {
     $info = posix_getpwnam("arsse");
diff --git a/dist/debian/rules b/dist/debian/rules
index 66a0a490..a011c6b8 100755
--- a/dist/debian/rules
+++ b/dist/debian/rules
@@ -4,3 +4,10 @@ DH_VERBOSE = 1
 
 %:
 	dh $@ --with systemd
+
+override_dh_install:
+	# Run the normal dh_install
+	dh_install
+	# Satisfy lintian's complaints about VCS control files
+	rm -f debian/arsse/vendor/**/.gitignore
+	rm -f debian/arsse/vendor/**/.gitattributes