Browse Source

Hopefully fix some Debian problems

rpm
J. King 3 years ago
parent
commit
14d3cdfe58
  1. 7
      .gitignore
  2. 4
      RoboFile.php
  3. 2
      dist/arsse
  4. 7
      dist/debian/rules

7
.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

4
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();
}

2
dist/arsse

@ -1,4 +1,4 @@
#! /usr/bin/php
#! /usr/bin/env php
<?php
if (posix_geteuid() == 0) {
$info = posix_getpwnam("arsse");

7
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

Loading…
Cancel
Save