* [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/files/
@ 2021-12-20 0:06 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2021-12-20 0:06 UTC (permalink / raw
To: gentoo-commits
commit: ef3989d3e251da2993c981ba8aa7d9fbf068cf02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 00:05:43 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 00:06:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3989d3
media-gfx/scrot: tidy up patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/scrot/files/scrot-1.7-fix-docdir.patch | 25 +++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
index ebae595ac38f..3e0fb09da85d 100644
--- a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
+++ b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
@@ -2,7 +2,7 @@ https://github.com/resurrecting-open-source-projects/scrot/pull/175
From: Sam James <sam@gentoo.org>
Date: Sun, 19 Dec 2021 23:59:45 +0000
-Subject: [PATCH] build: respect docdir
+Subject: [PATCH 1/2] build: respect docdir
Before this patch with --docdir=/usr/share/doc/scrot-1.7-r1 (example downstream
versioning for patches):
@@ -34,7 +34,7 @@ Bug: https://bugs.gentoo.org/828928
Signed-off-by: Sam James <sam@gentoo.org>
--- a/Makefile.am
+++ b/Makefile.am
-@@ -34,8 +34,7 @@ MAINTAINERCLEANFILES = Makefile.in
+@@ -34,10 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in
man_MANS = man/scrot.1
@@ -42,5 +42,24 @@ Signed-off-by: Sam James <sam@gentoo.org>
-docsdir = $(prefix)/share/doc/scrot
+doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
- EXTRA_DIST = man/scrot.1 $(docs_DATA)
+-EXTRA_DIST = man/scrot.1 $(docs_DATA)
++EXTRA_DIST = man/scrot.1
+
+ SUBDIRS = src
+
+From: Sam James <sam@gentoo.org>
+Date: Mon, 20 Dec 2021 00:03:35 +0000
+Subject: [PATCH 2/2] build: simplify man page installation
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,7 +36,7 @@ man_MANS = man/scrot.1
+
+ doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
+
+-EXTRA_DIST = man/scrot.1
++EXTRA_DIST = $(man_MANS)
+
+ SUBDIRS = src
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-20 0:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-20 0:06 [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/files/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox