diff --git a/build-deb.sh b/build-deb.sh index b2df38a..a8f153c 100755 --- a/build-deb.sh +++ b/build-deb.sh @@ -11,7 +11,7 @@ if [[ -z "${DEBEMAIL}" ]]; then fi BUILD_DIR=build_deb -TORCH_VERSION=$(git describe --tags) +TORCH_VERSION=$(git describe --tags --abbrev=0) DEBIAN_PKG=torch-agent-$TORCH_VERSION rm -rf $BUILD_DIR @@ -31,7 +31,6 @@ PKG_ROOT=$BUILD_DIR/$DEBIAN_PKG mkdir -p $PKG_ROOT/src/etc/torch cp -r debian $PKG_ROOT/ -cp torch-agent.service $PKG_ROOT/debian/ cp torch.conf $PKG_ROOT/src/etc/torch/ cd $PKG_ROOT diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 88e9ee1..0000000 --- a/debian/README.source +++ /dev/null @@ -1,10 +0,0 @@ -torch-agent for Debian ---------------------- - - - - - - -- Benjamin Dweck Tue, 06 Oct 2020 15:53:02 +0200 - diff --git a/debian/control b/debian/control index 5ded10d..441a78c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 4.4.1 Homepage: https://git.rudefox.io/bj/torch-agent X-Python3-Version: >= 3.2 #Vcs-Browser: https://salsa.debian.org/debian/torch-agent -#Vcs-Git: https://salsa.debian.org/debian/torch-agent.git +Vcs-Git: https://git.rudefox.io/bj/torch-agent.git Package: torch-agent Architecture: all diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex deleted file mode 100644 index d43cc54..0000000 --- a/debian/manpage.1.ex +++ /dev/null @@ -1,56 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" (C) Copyright 2020 Benjamin Dweck , -.\" -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH Torch-agent SECTION "October 6 2020" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -torch-agent \- program to do something -.SH SYNOPSIS -.B torch-agent -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B torch-agent -and -.B bar -commands. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBtorch-agent\fP is a program that... -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -For a complete description, see the Info files. -.TP -.B \-h, \-\-help -Show summary of options. -.TP -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex deleted file mode 100644 index ceaeb33..0000000 --- a/debian/manpage.sgml.ex +++ /dev/null @@ -1,154 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - October 6 2020"> - - SECTION"> - bjdweck@gmail.com"> - - Torch-agent"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (and may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex deleted file mode 100644 index 13a18ba..0000000 --- a/debian/manpage.xml.ex +++ /dev/null @@ -1,291 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A typical entry -in a Makefile or Makefile.am is: - -DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl -XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" - -manpage.1: manpage.xml - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The XSL files are in -docbook-xsl. A description of the parameters you can use can be found in the -docbook-xsl-doc-* packages. Please remember that if you create the nroff -version in one of the debian/rules file targets (such as build), you will need -to include xsltproc and docbook-xsl in your Build-Depends control field. -Alternatively use the xmlto command/package. That will also automatically -pull in xsltproc and docbook-xsl. - -Notes for using docbook2x: docbook2x-man does not automatically create the -AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as - ... . - -To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections -read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be -found in the docbook-xsl-doc-html package. - -Validation can be done using: `xmllint -''-noout -''-valid manpage.xml` - -General documentation about man-pages and man-page-formatting: -man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ - ---> - - - - - - - - - - - - - -]> - - - - &dhtitle; - &dhpackage; - - - &dhfirstname; - &dhsurname; - Wrote this manpage for the Debian system. -
- &dhemail; -
- - - - 2007 - &dhusername; - - - This manual page was written for the Debian system - (and may be used by others). - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU General Public License, - Version 2 or (at your option) any later version published by - the Free Software Foundation. - On Debian systems, the complete text of the GNU General Public - License can be found in - /usr/share/common-licenses/GPL. - - - - &dhucpackage; - &dhsection; - - - &dhpackage; - program to do something - - - - &dhpackage; - - - - - - - - - this - - - - - - - - this - that - - - - - &dhpackage; - - - - - - - - - - - - - - - - - - - DESCRIPTION - This manual page documents briefly the - &dhpackage; and bar - commands. - This manual page was written for the Debian distribution - because the original program does not have a manual page. - Instead, it has documentation in the GNU - info - 1 - format; see below. - &dhpackage; is a program that... - - - OPTIONS - The program follows the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - - info - 1 - files. - - - - - - - Does this and that. - - - - - - - Show summary of options. - - - - - - - Show version of program. - - - - - - FILES - - - /etc/foo.conf - - The system-wide configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - ${HOME}/.foo.conf - - The per-user configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - - - ENVIRONMENT - - - FOO_CONF - - If used, the defined file is used as configuration - file (see also ). - - - - - - DIAGNOSTICS - The following diagnostics may be issued - on stderr: - - - Bad configuration file. Exiting. - - The configuration file seems to contain a broken configuration - line. Use the option, to get more info. - - - - - &dhpackage; provides some return codes, that can - be used in scripts: - - Code - Diagnostic - - 0 - Program exited successfully. - - - 1 - The configuration file seems to be broken. - - - - - - BUGS - The program is currently limited to only work - with the foobar library. - The upstreams BTS can be found - at . - - - SEE ALSO - - - bar - 1 - , - baz - 1 - , - foo.conf - 5 - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - info - 1 - system. - - - diff --git a/debian/postinst b/debian/postinst index 669ec00..9647a8f 100644 --- a/debian/postinst +++ b/debian/postinst @@ -49,9 +49,9 @@ configure_tor_controller() { case "$1" in configure) - if ! getent passwd $USER >/dev/null ; then - useradd -r -g $GROUP $USER - fi + if ! getent passwd $USER >/dev/null ; then + useradd -r -g $GROUP $USER + fi chown $USER /etc/torch chown $USER /etc/torch/torch.conf diff --git a/debian/prerm.ex b/debian/prerm.ex deleted file mode 100644 index 55eee78..0000000 --- a/debian/prerm.ex +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# prerm script for torch-agent -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see https://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 7c9e5a3..03090c8 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ export PYBUILD_NAME=torch-agent export PYBUILD_SYSTEM=distutils -export PYBUILD_DISABLE=test %: dh $@ --with python3 --buildsystem=pybuild diff --git a/debian/salsa-ci.yml.ex b/debian/salsa-ci.yml.ex deleted file mode 100644 index 260ebbe..0000000 --- a/debian/salsa-ci.yml.ex +++ /dev/null @@ -1,11 +0,0 @@ -# For more information on what jobs are run see: -# https://salsa.debian.org/salsa-ci-team/pipeline -# -# To enable the jobs, go to your repository (at salsa.debian.org) -# and click over Settings > CI/CD > Expand (in General pipelines). -# In "Custom CI config path" write debian/salsa-ci.yml and click -# in "Save Changes". The CI tests will run after the next commit. ---- -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/debian/torch-agent-docs.docs b/debian/torch-agent-docs.docs index efea0a6..e69de29 100644 --- a/debian/torch-agent-docs.docs +++ b/debian/torch-agent-docs.docs @@ -1,2 +0,0 @@ -README.Debian -README.source diff --git a/debian/torch-agent.cron.d.ex b/debian/torch-agent.cron.d.ex deleted file mode 100644 index 0910f88..0000000 --- a/debian/torch-agent.cron.d.ex +++ /dev/null @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the torch-agent package -# -0 4 * * * root [ -x /usr/bin/torch-agent_maintenance ] && /usr/bin/torch-agent_maintenance diff --git a/debian/torch-agent.debhelper.log b/debian/torch-agent.debhelper.log deleted file mode 100644 index e15a197..0000000 --- a/debian/torch-agent.debhelper.log +++ /dev/null @@ -1 +0,0 @@ -dh_installsystemd diff --git a/debian/torch-agent.doc-base.EX b/debian/torch-agent.doc-base.EX deleted file mode 100644 index 25a60ee..0000000 --- a/debian/torch-agent.doc-base.EX +++ /dev/null @@ -1,20 +0,0 @@ -Document: torch-agent -Title: Debian torch-agent Manual -Author: -Abstract: This manual describes what torch-agent is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/torch-agent/torch-agent.sgml.gz - -Format: postscript -Files: /usr/share/doc/torch-agent/torch-agent.ps.gz - -Format: text -Files: /usr/share/doc/torch-agent/torch-agent.text.gz - -Format: HTML -Index: /usr/share/doc/torch-agent/html/index.html -Files: /usr/share/doc/torch-agent/html/*.html diff --git a/debian/torch-agent.postrm.debhelper b/debian/torch-agent.postrm.debhelper deleted file mode 100644 index bc043aa..0000000 --- a/debian/torch-agent.postrm.debhelper +++ /dev/null @@ -1,19 +0,0 @@ -# Automatically added by dh_installsystemd/12.10ubuntu1 -if [ -d /run/systemd/system ]; then - systemctl --system daemon-reload >/dev/null || true -fi -# End automatically added section -# Automatically added by dh_installsystemd/12.10ubuntu1 -if [ "$1" = "remove" ]; then - if [ -x "/usr/bin/deb-systemd-helper" ]; then - deb-systemd-helper mask 'torch-agent.service' >/dev/null || true - fi -fi - -if [ "$1" = "purge" ]; then - if [ -x "/usr/bin/deb-systemd-helper" ]; then - deb-systemd-helper purge 'torch-agent.service' >/dev/null || true - deb-systemd-helper unmask 'torch-agent.service' >/dev/null || true - fi -fi -# End automatically added section diff --git a/torch-agent.service b/debian/torch-agent.service similarity index 100% rename from torch-agent.service rename to debian/torch-agent.service diff --git a/debian/watch.ex b/debian/watch.ex deleted file mode 100644 index 888e752..0000000 --- a/debian/watch.ex +++ /dev/null @@ -1,38 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 4 file -version=4 - -# PGP signature mangle, so foo.tar.gz has foo.tar.gz.sig -#opts="pgpsigurlmangle=s%$%.sig%" - -# HTTP site (basic) -#http://example.com/downloads.html \ -# files/torch-agent-([\d\.]+)\.tar\.gz debian uupdate - -# Uncomment to examine an FTP server -#ftp://ftp.example.com/pub/torch-agent-(.*)\.tar\.gz debian uupdate - -# SourceForge hosted projects -# http://sf.net/torch-agent/ torch-agent-(.*)\.tar\.gz debian uupdate - -# GitHub hosted projects -#opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%-$1.tar.gz%" \ -# https://github.com//torch-agent/tags \ -# (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate - -# PyPI -# https://pypi.debian.net/torch-agent/torch-agent-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) - -# Direct Git -# opts="mode=git" http://git.example.com/torch-agent.git \ -# refs/tags/v([\d\.]+) debian uupdate - - - - -# Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html torch-agent-(.*)\.tar\.gz