From: Karol Krenski <charles@pld-linux.org>
Date: Fri, 11 Jun 2010 17:51:38 +0000 (+0000)
Subject: - updated for 1.2-rc2
X-Git-Tag: auto/th/wine-1_2-0_rc4_1~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=3152d5e1806af815f90b1b77bcaa354030679d18;p=packages%2Fwine.git

- updated for 1.2-rc2

Changed files:
    wine-manpaths.patch -> 1.7
---

diff --git a/wine-manpaths.patch b/wine-manpaths.patch
index dbd6826..bf7e9ea 100644
--- a/wine-manpaths.patch
+++ b/wine-manpaths.patch
@@ -55,32 +55,38 @@
 -	$(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext)
 +	$(RM) $(DESTDIR)$(mandir)/de/man$(prog_manext)/wineserver.$(prog_manext)
 +	$(RM) $(DESTDIR)$(mandir)/fr/man$(prog_manext)/wineserver.$(prog_manext)
---- wine-1.1.43/tools/Makefile.in.orig	2010-04-20 21:03:11.000000000 +0200
-+++ wine-1.1.43/tools/Makefile.in	2010-04-20 21:04:04.000000000 +0200
-@@ -38,7 +38,7 @@
+--- wine-1.2-rc2/tools/Makefile.in.orig	2010-05-28 19:39:36.000000000 +0200
++++ wine-1.2-rc2/tools/Makefile.in	2010-06-11 19:29:20.000000000 +0200
+@@ -37,8 +37,8 @@
  	$(DESTDIR)$(datadir)/applications \
  	$(DESTDIR)$(datadir)/wine \
  	$(DESTDIR)$(mandir)/man$(prog_manext) \
--	$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)
-+	$(DESTDIR)$(mandir)/de/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)
 
  UPDATE_DESKTOP_DATABASE = update-desktop-database
 
-@@ -77,7 +77,7 @@
+@@ -79,8 +79,8 @@
  install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
  	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker
  	$(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
 -	$(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)$(datadir)/wine/wine.inf \
-@@ -85,7 +85,7 @@
+@@ -88,8 +88,8 @@
  		$(DESTDIR)$(datadir)/applications/wine.desktop \
  		$(DESTDIR)$(bindir)/winemaker \
  		$(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
--		$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
-+		$(DESTDIR)$(mandir)/de/man$(prog_manext)/winemaker.$(prog_manext)
+-		$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \
+-		$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
++		$(DESTDIR)$(mandir)/de/man$(prog_manext)/winemaker.$(prog_manext) \
++		$(DESTDIR)$(mandir)/fr/man$(prog_manext)/winemaker.$(prog_manext)
  	-$(UPDATE_DESKTOP_DATABASE)
- 
+
  depend: makedep$(EXEEXT)