mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00
Code Issues Activity

Fix more lintian complaints

Browse source
This commit is contained in:
J. KIng 2021-05-28 16:23:42 -04:00
parent 14d3cdfe58
commit add1acc87a
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
RoboFile.php
View file

@ -211,6 +211,16 @@ class RoboFile extends \Robo\Tasks {
$dir."yarn.lock", $dir."yarn.lock",
$dir."postcss.config.js", $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 // generate a sample configuration file
$t->addTask($this->taskExec(escapeshellarg(\PHP_BINARY)." arsse.php conf save-defaults config.defaults.php")->dir($dir)); $t->addTask($this->taskExec(escapeshellarg(\PHP_BINARY)." arsse.php conf save-defaults config.defaults.php")->dir($dir));
// remove any existing archive // 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)); $t->addTask($this->taskPack($dir."arsse_$version.orig.tar.gz")->addDir("arsse-$version", $base));
// copy Debian files to lower down in the tree // copy Debian files to lower down in the tree
$t->addTask($this->taskFilesystemStack()->mirror($base."dist/debian", $base."debian")); $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(); return $t->run();
} }

2
dist/debian/control vendored
View file

@ -6,7 +6,7 @@ Standards-Version: 4.5.1
Homepage: https://thearsse.com/ Homepage: https://thearsse.com/
Vcs-Browser: https://code.mensbeam.com/MensBeam/arsse/ Vcs-Browser: https://code.mensbeam.com/MensBeam/arsse/
Vcs-Git: https://code.mensbeam.com/MensBeam/arsse/ Vcs-Git: https://code.mensbeam.com/MensBeam/arsse/
Build-Depends: debhelper, dh-systemd Build-Depends: debhelper
Package: arsse Package: arsse
Architecture: all Architecture: all

4
dist/debian/lintian-overrides vendored
View file

@ -1,6 +1,4 @@
# We make reference to "Tiny Tiny RSS" # We make reference to "Tiny Tiny RSS"
spelling-error-in-description Tiny Tiny (duplicate word) Tiny 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/) 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)

9
dist/debian/rules vendored
View file

@ -3,11 +3,4 @@
DH_VERBOSE = 1 DH_VERBOSE = 1
%: %:
dh $@ --with systemd dh $@
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

2
dist/debian/source/lintian-overrides vendored Normal file
View file

@ -0,0 +1,2 @@
# Development environment is slightly out of date
newer-standards-version