This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit 2e1790d83d990eb662ff12d88364c42d3f15932d Author: Jens Reyer <[email protected]> Date: Mon Mar 7 21:28:10 2016 +0100 Install all manpages for all installed executables. Rename the manpages also in arch specific builds. Handle the localized manpages, remove UTF-8 from filenames and add VERSION before the first "." in the filenames. Don't rename to .1 in d/rules (keep it simple here, dh takes care of that later). # Conflicts: # debian/rules # debian/wineVERSION.manpages --- debian/rules | 15 ++++++++------- debian/wine32VERSION-tools.manpages | 9 ++++++++- debian/wine64VERSION-tools.manpages | 9 ++++++++- debian/wineVERSION.manpages | 27 +++++++++++++++++---------- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/debian/rules b/debian/rules index 907e48b..2bddb13 100755 --- a/debian/rules +++ b/debian/rules @@ -112,16 +112,15 @@ override_dh_auto_install-indep: $(INSTALLS) cp debian/scripts/wine debian/tmp/wine$(VERSION) for dir in loader server programs/msiexec programs/winedbg \ programs/wineconsole programs/regedit programs/regsvr32 \ - programs/wineboot programs/winefile programs/winecfg; do \ + programs/wineboot programs/winefile programs/winepath \ + programs/winecfg; do \ ./tools/makedep $$dir; \ make -C $$dir install-man; \ done - for file in $$(find . -name \*.man); do \ - rename=$$(basename $$file | sed s/\\.man/$(VERSION)\\.1/); \ + for file in $$(find . ! -path "./debian/*" -name \*.man); do \ + rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \ cp $$file debian/tmp/$$rename || true; \ done - rm -f debian/tmp/*UTF-8* - rm -f debian/tmp/winegcc$(VERSION).1 override_dh_auto_install-arch: $(INSTALLS) mkdir -p debian/tmp @@ -129,9 +128,11 @@ override_dh_auto_install-arch: $(INSTALLS) cp tools/winedump/README debian/tmp/README.winedump cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS) dh_auto_install + for file in $$(find . ! -path "./debian/*" -name \*.man); do \ + rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \ + cp $$file debian/tmp/$$rename || true; \ + done cp loader/wine.man debian/tmp/usr/share/man/man1/wine64$(VERSION).1 - cd debian/tmp/usr/share/man/man1 && \ - cp winegcc.1 winegcc$(VERSION).1 || true test -f debian/tmp/$(BINDIR)/wine-preloader || \ cp debian/scripts/wine-preloader debian/tmp/$(BINDIR) diff --git a/debian/wine32VERSION-tools.manpages b/debian/wine32VERSION-tools.manpages index de0d8d2..473229d 100644 --- a/debian/wine32VERSION-tools.manpages +++ b/debian/wine32VERSION-tools.manpages @@ -1 +1,8 @@ -debian/tmp/usr/share/man/man1/winegccVERSION.1 +debian/tmp/wmcVERSION.man +debian/tmp/wrcVERSION.man +debian/tmp/winegccVERSION.man +debian/tmp/winedumpVERSION.man +debian/tmp/winebuildVERSION.man +debian/tmp/winemakerVERSION.man +debian/tmp/winemakerVERSION.de.man +debian/tmp/winemakerVERSION.fr.man diff --git a/debian/wine64VERSION-tools.manpages b/debian/wine64VERSION-tools.manpages index de0d8d2..473229d 100644 --- a/debian/wine64VERSION-tools.manpages +++ b/debian/wine64VERSION-tools.manpages @@ -1 +1,8 @@ -debian/tmp/usr/share/man/man1/winegccVERSION.1 +debian/tmp/wmcVERSION.man +debian/tmp/wrcVERSION.man +debian/tmp/winegccVERSION.man +debian/tmp/winedumpVERSION.man +debian/tmp/winebuildVERSION.man +debian/tmp/winemakerVERSION.man +debian/tmp/winemakerVERSION.de.man +debian/tmp/winemakerVERSION.fr.man diff --git a/debian/wineVERSION.manpages b/debian/wineVERSION.manpages index 3b2ddd9..03f8521 100644 --- a/debian/wineVERSION.manpages +++ b/debian/wineVERSION.manpages @@ -1,11 +1,18 @@ -debian/tmp/wineVERSION.1 -debian/tmp/wineserverVERSION.1 +debian/tmp/wineVERSION.man +debian/tmp/wineVERSION.de.man +debian/tmp/wineVERSION.fr.man +debian/tmp/wineVERSION.pl.man -debian/tmp/msiexecVERSION.1 -debian/tmp/regeditVERSION.1 -debian/tmp/winecfgVERSION.1 -debian/tmp/winedbgVERSION.1 -debian/tmp/winebootVERSION.1 -debian/tmp/winefileVERSION.1 -debian/tmp/regsvr32VERSION.1 -debian/tmp/wineconsoleVERSION.1 +debian/tmp/wineserverVERSION.man +debian/tmp/wineserverVERSION.de.man +debian/tmp/wineserverVERSION.fr.man + +debian/tmp/msiexecVERSION.man +debian/tmp/regeditVERSION.man +debian/tmp/winecfgVERSION.man +debian/tmp/winedbgVERSION.man +debian/tmp/winebootVERSION.man +debian/tmp/winefileVERSION.man +debian/tmp/winepathVERSION.man +debian/tmp/regsvr32VERSION.man +debian/tmp/wineconsoleVERSION.man -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
