one day i'll attach the patches i say i'm gonna
From 7a86b08751735cfd0afff941e5f7b8bd90ea1944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz> Date: Wed, 14 Jun 2023 19:23:16 +0200 Subject: [PATCH 1/3] Remove /etc/sysconfig reference from /etc/default/rasdaemon X-Mutt-PGP: OS
--- debian/control | 2 +- debian/rasdaemon.install | 2 -- debian/rules | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 debian/rasdaemon.install diff --git a/debian/control b/debian/control index 4a79b1b..c827820 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Taihsiang Ho (tai271828) <e...@tai271828.me> Build-Depends: debhelper (>= 12), quilt, libsqlite3-dev, libgettextpo-dev, - autoconf, dh-exec + autoconf Standards-Version: 4.5.0 Homepage: https://salsa.debian.org/tai271828/rasdaemon Vcs-Git: https://salsa.debian.org/tai271828/rasdaemon.git diff --git a/debian/rasdaemon.install b/debian/rasdaemon.install old mode 100755 new mode 100644 index 6acf933..f830f85 --- a/debian/rasdaemon.install +++ b/debian/rasdaemon.install @@ -1,4 +1,2 @@ -#!/usr/bin/dh-exec misc/rasdaemon.service /lib/systemd/system misc/ras-mc-ctl.service /lib/systemd/system -misc/rasdaemon.env => /etc/default/rasdaemon diff --git a/debian/rules b/debian/rules index cbde216..9082553 100755 --- a/debian/rules +++ b/debian/rules @@ -19,3 +19,5 @@ override_dh_install: dh_installsystemd --name=rasdaemon rasdaemon.service dh_installsystemd --name=ras-mc-ctl ras-mc-ctl.service rm -rf $(CURDIR)/debian/rasdaemon/usr/include + mkdir -p $(CURDIR)/debian/rasdaemon/etc/default + sed '\:/etc/sysconfig:d' < $(CURDIR)/misc/rasdaemon.env > $(CURDIR)/debian/rasdaemon/etc/default/rasdaemon -- 2.39.2
From 6f63004a8bff132549482815aeda0df382ec8351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz> Date: Wed, 14 Jun 2023 19:30:56 +0200 Subject: [PATCH 2/3] Fix config file path in rasdaemon(8) X-Mutt-PGP: OS --- debian/patches/rasdaemon.8-config-path.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 20 insertions(+) create mode 100644 debian/patches/rasdaemon.8-config-path.patch diff --git a/debian/patches/rasdaemon.8-config-path.patch b/debian/patches/rasdaemon.8-config-path.patch new file mode 100644 index 0000000..798d93f --- /dev/null +++ b/debian/patches/rasdaemon.8-config-path.patch @@ -0,0 +1,19 @@ +diff --git a/man/rasdaemon.8.in b/man/rasdaemon.8.in +index 833c8e1..59affb4 100644 +--- a/man/rasdaemon.8.in ++++ b/man/rasdaemon.8.in +@@ -62,12 +62,8 @@ .SH OPTIONS + .BI "--version" + Print the program version and exit. + +-.SH CONFIG FILE +- +-The \fBrasdaemon\fR program supports a config file to set rasdaemon systemd service +-environment variables. By default the config file is read from /etc/sysconfig/rasdaemon. +- +-The general format is environmentname=value. ++.SH FILES ++.B /etc/default/rasdaemon + + .SH SEE ALSO + \fBras-mc-ctl\fR(8) diff --git a/debian/patches/series b/debian/patches/series index 763d6ea..bbea539 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ systemd-targets.patch add-man-options.patch systemd-requires.patch ras-mc-ctl.patch +rasdaemon.8-config-path.patch -- 2.39.2
From d72612c57c3883588fd7c1cda9d4f2be899a5ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz> Date: Wed, 14 Jun 2023 19:31:51 +0200 Subject: [PATCH 3/3] Fix empty line before heading in manuals X-Mutt-PGP: OS --- debian/patches/manual-spacing-before-TH.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/manual-spacing-before-TH.patch diff --git a/debian/patches/manual-spacing-before-TH.patch b/debian/patches/manual-spacing-before-TH.patch new file mode 100644 index 0000000..14e3089 --- /dev/null +++ b/debian/patches/manual-spacing-before-TH.patch @@ -0,0 +1,26 @@ +diff --git a/man/ras-mc-ctl.8.in b/man/ras-mc-ctl.8.in +index 54a8a3a..5a790f4 100644 +--- a/man/ras-mc-ctl.8.in ++++ b/man/ras-mc-ctl.8.in +@@ -23,7 +23,7 @@ + .\" with this program; if not, write to the Free Software Foundation, Inc., + .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + .\"**************************************************************************** +- ++. + .TH RAS-MC-CTL 8 "@META_DATE@" "@META_ALIAS@" "RAS memory controller admin utility" + + .SH NAME +diff --git a/man/rasdaemon.8.in b/man/rasdaemon.8.in +index 59affb4..1beff9c 100644 +--- a/man/rasdaemon.8.in ++++ b/man/rasdaemon.8.in +@@ -17,7 +17,7 @@ + .\" with this program; if not, write to the Free Software Foundation, Inc., + .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + .\"**************************************************************************** +- ++. + .TH RASDAEMON 8 "@META_DATE@" "@META_ALIAS@" "RAS memory controller admin utility" + + .SH NAME diff --git a/debian/patches/series b/debian/patches/series index bbea539..0e8fe08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ add-man-options.patch systemd-requires.patch ras-mc-ctl.patch rasdaemon.8-config-path.patch +manual-spacing-before-TH.patch -- 2.39.2
signature.asc
Description: PGP signature
