X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wine-manpaths.patch;h=775f5f3c7a12332dab9d47ff5819b112401e210e;hb=76656d4fff52f1d7c65a97081b71436226ca7efe;hp=52cb1952bbd69384540b88e2a160261e402192dc;hpb=09afe4cc632e520de4e20704d76a983c4b9093ab;p=packages%2Fwine.git diff --git a/wine-manpaths.patch b/wine-manpaths.patch index 52cb195..775f5f3 100644 --- a/wine-manpaths.patch +++ b/wine-manpaths.patch @@ -1,6 +1,6 @@ ---- wine-1.1.16/loader/Makefile.in~ 2009-02-27 23:21:46.000000000 +0100 -+++ wine-1.1.16/loader/Makefile.in 2009-02-28 14:51:11.904159157 +0100 -@@ -40,8 +40,8 @@ +--- wine-1.3.9/server/Makefile.in~ 2010-12-10 20:33:07.000000000 +0100 ++++ wine-1.3.9/server/Makefile.in 2010-12-10 23:38:49.953335249 +0100 +@@ -54,8 +54,8 @@ INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(mandir)/man$(prog_manext) \ @@ -9,47 +9,68 @@ + $(DESTDIR)$(mandir)/de/man$(prog_manext) \ + $(DESTDIR)$(mandir)/fr/man$(prog_manext) - all: $(WINE_BINARIES) $(WINE_BINARIES:%=%-installed) $(MODULE) $(MANPAGES) + all: $(PROGRAMS) -@@ -88,13 +88,13 @@ - fi; \ - done - $(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) -- $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) -- $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) -+ $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext) -+ $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext) +@@ -71,8 +71,8 @@ + $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver + + install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) +- $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) +- $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) ++ $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wineserver.$(prog_manext) ++ $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) $(WINE_BINARIES) $(MODULE) - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) -- $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) -- $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) -+ $(RM) $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext) -+ $(RM) $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext) - - @DEPENDENCIES@ # everything below this line is overwritten by make depend ---- wine-1.1.16/server/Makefile.in~ 2009-02-27 23:21:46.000000000 +0100 -+++ wine-1.1.16/server/Makefile.in 2009-02-28 14:50:16.838539394 +0100 -@@ -62,7 +62,7 @@ - INSTALLDIRS = \ - $(DESTDIR)$(bindir) \ + $(RM) $(DESTDIR)$(bindir)/wineserver +--- wine-1.3.9/tools/Makefile.in~ 2010-12-10 20:33:07.000000000 +0100 ++++ wine-1.3.9/tools/Makefile.in 2010-12-10 23:39:44.986668581 +0100 +@@ -32,8 +32,8 @@ + $(DESTDIR)$(datadir)/applications \ + $(DESTDIR)$(datadir)/wine \ $(DESTDIR)$(mandir)/man$(prog_manext) \ +- $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ - $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) ++ $(DESTDIR)$(mandir)/de/man$(prog_manext) \ + $(DESTDIR)$(mandir)/fr/man$(prog_manext) - all: $(PROGRAMS) $(MANPAGES) + UPDATE_DESKTOP_DATABASE = update-desktop-database -@@ -77,10 +77,10 @@ - install install-lib:: wineserver-installed $(MANPAGES) $(INSTALLDIRS) - $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver - $(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) -- $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) -+ $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext) +@@ -75,8 +75,8 @@ + $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker + + install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) +- $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) +- $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) ++ $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/winemaker.$(prog_manext) ++ $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/wineserver $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) -- $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) -+ $(RM) $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext) + $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \ +--- wine-1.3.22/loader/Makefile.in.orig 2011-06-10 20:08:11.000000000 +0200 ++++ wine-1.3.22/loader/Makefile.in 2011-06-12 17:41:34.984957008 +0200 +@@ -24,9 +24,9 @@ + INSTALLDIRS = \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(mandir)/man$(prog_manext) \ +- $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ +- $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) \ +- $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext) ++ $(DESTDIR)$(mandir)/de/man$(prog_manext) \ ++ $(DESTDIR)$(mandir)/fr/man$(prog_manext) \ ++ $(DESTDIR)$(mandir)/pl/man$(prog_manext) + + all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES) - @DEPENDENCIES@ # everything below this line is overwritten by make depend +@@ -53,9 +53,9 @@ + $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY) + + install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy +- $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) +- $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) +- $(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext) ++ $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de/man$(prog_manext)/wine.$(prog_manext) ++ $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wine.$(prog_manext) ++ $(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl/man$(prog_manext)/wine.$(prog_manext) + + uninstall:: + -cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES)