[Gpg4win-commits] r113 - in trunk: . packages src

[scm-commit at wald.intevation.org]

Author: werner
Date: 2006-01-05 20:39:32 +0100 (Thu, 05 Jan 2006)
New Revision: 113

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/src/inst-winpt.nsi
Log:
winpt corrections - lets try again building an installer


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-01-05 18:25:31 UTC (rev 112)
+++ trunk/ChangeLog	2006-01-05 19:39:32 UTC (rev 113)
@@ -2,6 +2,8 @@
 
 	Released 0.5.0.
 
+	* src/inst-winpt.nsi: Remove old mo installation hack.
+
 	* src/Makefile.am (EXTRA_DIST): Add config.site.
 	* Makefile.am (EXTRA_DIST): Update patches.
 

Modified: trunk/README
===================================================================
--- trunk/README	2006-01-05 18:25:31 UTC (rev 112)
+++ trunk/README	2006-01-05 19:39:32 UTC (rev 113)
@@ -52,7 +52,7 @@
 and run configure as described above.
 
 
-Copyright 2005 g10 Code GmbH
+Copyright 2005, 2006 g10 Code GmbH
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-01-05 18:25:31 UTC (rev 112)
+++ trunk/configure.ac	2006-01-05 19:39:32 UTC (rev 113)
@@ -1,5 +1,5 @@
 # configure.ac for GPG4Win
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2006 g10 Code GmbH
 # 
 # This file is part of GPG4Win
 # 

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2006-01-05 18:25:31 UTC (rev 112)
+++ trunk/packages/packages.current	2006-01-05 19:39:32 UTC (rev 113)
@@ -13,9 +13,8 @@
 # line will be appended to the current base URL (with a / as
 # delimiter).  The statement "chk" is followed by the SHA1 checksum of
 # the last file.
-#
-# 2005-12-06 11:16:12
 
+
 # GNU
 server ftp://ftp.cs.tu-berlin.de/pub/gnu
 
@@ -123,10 +122,13 @@
 
 # WinPT
 
-server http://wald.intevation.org/frs/download.php
+#server http://wald.intevation.org/frs/download.php
+#file 84/winpt-0.11.4.tar.bz2
+#chk  f880bd2103b51a8e2f6e94f58a9524c523765ccb
 
-file 84/winpt-0.11.4.tar.bz2
-chk  f880bd2103b51a8e2f6e94f58a9524c523765ccb
+server ftp://ftp.g10code.com/g10code/scratch
+file winpt-0.11.5-cvs.tar.bz2
+chk  8299a0d2556e56623b188b9d23583ef88b9607f0
 
 
 # GPGee

Modified: trunk/src/inst-winpt.nsi
===================================================================
--- trunk/src/inst-winpt.nsi	2006-01-05 18:25:31 UTC (rev 112)
+++ trunk/src/inst-winpt.nsi	2006-01-05 19:39:32 UTC (rev 113)
@@ -23,9 +23,6 @@
 !endif
 !define prefix ${ipdir}/winpt-${gpg4win_pkg_winpt_version}
 
-# Kludge to access the generated winpt.mo file
-!define winptpath playground/build/winpt-${gpg4win_pkg_winpt_version}
-
 Section "WinPT" SEC_winpt
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
@@ -36,7 +33,7 @@
   #File ${winptpath}/keyserver.conf
 
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
-  File ${winptpath}/Po/winpt.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/winpt.mo
   
   # Do not install the documentation until we have agreed on the filenames.
   #SetOutPath "$INSTDIR\share\winpt"