From add1acc87a9d2c74db41d286ded2a7ae595d498f Mon Sep 17 00:00:00 2001
From: "J. KIng" <jking@jkingweb.ca>
Date: Fri, 28 May 2021 16:23:42 -0400
Subject: [PATCH] Fix more lintian complaints

---
 RoboFile.php                         | 12 +++++++++++-
 dist/debian/control                  |  2 +-
 dist/debian/lintian-overrides        |  4 +---
 dist/debian/rules                    |  9 +--------
 dist/debian/source/lintian-overrides |  2 ++
 5 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 dist/debian/source/lintian-overrides

diff --git a/RoboFile.php b/RoboFile.php
index fefd24d..8c107fe 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -211,6 +211,16 @@ class RoboFile extends \Robo\Tasks {
                 $dir."yarn.lock",
                 $dir."postcss.config.js",
             ]));
+            $t->addCode(function() use ($dir) {
+                // Remove files which lintian complains about; they're otherwise harmless
+                $files = [];
+                foreach (new \CallbackFilterIterator(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir."vendor", \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS)), function($v, $k, $i) {
+                    return preg_match('/\/\.git(?:ignore|attributes|modules)$/', $v);
+                }) as $f) {
+                    $files[] = $f;
+                }
+                return $this->taskFilesystemStack()->remove($files)->run();
+            });
             // generate a sample configuration file
             $t->addTask($this->taskExec(escapeshellarg(\PHP_BINARY)." arsse.php conf save-defaults config.defaults.php")->dir($dir));
             // remove any existing archive
@@ -266,7 +276,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($base));
+        //$t->addTask($this->taskExec("deber")->dir($base));
         return $t->run();
     }
 
diff --git a/dist/debian/control b/dist/debian/control
index 09cd9ef..da006c2 100644
--- a/dist/debian/control
+++ b/dist/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 4.5.1
 Homepage: https://thearsse.com/
 Vcs-Browser: https://code.mensbeam.com/MensBeam/arsse/
 Vcs-Git: https://code.mensbeam.com/MensBeam/arsse/
-Build-Depends: debhelper, dh-systemd
+Build-Depends: debhelper
 
 Package: arsse
 Architecture: all
diff --git a/dist/debian/lintian-overrides b/dist/debian/lintian-overrides
index 94cdc64..3e67ae3 100644
--- a/dist/debian/lintian-overrides
+++ b/dist/debian/lintian-overrides
@@ -1,6 +1,4 @@
 # We make reference to "Tiny Tiny RSS"
 spelling-error-in-description Tiny Tiny (duplicate word) Tiny
-# The manual for DrUUID (a dependency includes a harmless "up" link
+# The manual for DrUUID (a dependency) includes a harmless "up" link
 privacy-breach-generic usr/share/arsse/vendor/jkingweb/druuid/documentation/manual.html [<link rel="up" href="http://jkingweb.ca/code/">] (http://jkingweb.ca/code/)
-# Development environment is slightly out of date
-source: newer-standards-version 4.5.1 (current is 4.5.0)
diff --git a/dist/debian/rules b/dist/debian/rules
index a011c6b..26f2a18 100755
--- a/dist/debian/rules
+++ b/dist/debian/rules
@@ -3,11 +3,4 @@
 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
+	dh $@
diff --git a/dist/debian/source/lintian-overrides b/dist/debian/source/lintian-overrides
new file mode 100644
index 0000000..ab33538
--- /dev/null
+++ b/dist/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Development environment is slightly out of date
+newer-standards-version