[Pkg-wmaker-commits] [wmaker] 10/18: debian/rules: New override_dh_installdocs target; contains code renaming README files from override_dh_install target. debian/wmaker-common.{docs,install}: Move installation of various README files from dh_install to dh_installdocs.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Mar 16 15:15:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch experimental
in repository wmaker.
commit 78cc05fd96d4e4db7e6e5211dbc89272a958aa7c
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Sat Mar 11 12:13:30 2017 -0500
debian/rules: New override_dh_installdocs target; contains code renaming
README files from override_dh_install target.
debian/wmaker-common.{docs,install}: Move installation of various README
files from dh_install to dh_installdocs.
---
debian/rules | 13 ++++++++-----
debian/wmaker-common.docs | 4 ++++
debian/wmaker-common.install | 4 ----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/debian/rules b/debian/rules
index 0155078..8d1de46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,17 +39,20 @@ override_dh_auto_configure:
override_dh_installmenu:
dh_installmenu -a --noscripts
-override_dh_install:
- # Fix perms for /usr/share/WindowMaker/*sh before install them
- chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/autostart.sh
- chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/exitscript.sh
-
+override_dh_installdocs:
# Readmes - Copy+rename before install
# We use the root of the temporal directory debian/tmp
cp po/README $(DEBIAN_TMP)/README.po
cp README.definable-cursor $(DEBIAN_TMP)/README.definable-cursor
cp WPrefs.app/README $(DEBIAN_TMP)/README.WPrefs
cp WPrefs.app/po/README $(DEBIAN_TMP)/README.WPrefs.po
+ dh_installdocs
+
+override_dh_install:
+ # Fix perms for /usr/share/WindowMaker/*sh before install them
+ chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/autostart.sh
+ chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/exitscript.sh
+
# Now, change the #wmdatadir# string to $(WMSHAREDIR)
perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):' `find $(DEBIAN_TMP)/$(WMSHAREDIR) -name plmenu.*`
diff --git a/debian/wmaker-common.docs b/debian/wmaker-common.docs
index 729f290..381d6c0 100644
--- a/debian/wmaker-common.docs
+++ b/debian/wmaker-common.docs
@@ -7,4 +7,8 @@ README
TODO
debian/copyright
debian/debianfiles/Themes/DebianLegacy.txt
+debian/tmp/README.WPrefs
+debian/tmp/README.WPrefs.po
+debian/tmp/README.definable-cursor
+debian/tmp/README.po
util/wm-oldmenu2new
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index 4d8ba3d..a3b93b6 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -1,7 +1,3 @@
-README.WPrefs usr/share/doc/wmaker
-README.WPrefs.po usr/share/doc/wmaker
-README.definable-cursor usr/share/doc/wmaker
-README.po usr/share/doc/wmaker
debian/debianfiles/Themes/Debian usr/share/WindowMaker/Themes
debian/debianfiles/Themes/DebianLegacy.style usr/share/WindowMaker/Themes
debian/debianfiles/Themes/DebianSwirl.jpg usr/share/WindowMaker/Backgrounds
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git
More information about the Pkg-wmaker-commits
mailing list