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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-18 16:22:39 +0100 (Fri, 18 Jan 2008)
New Revision: 684

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/Makefile.am
   trunk/src/inst-gpgol.nsi
   trunk/src/uninst-gpgol.nsi
Log:
2008-01-18  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Update gpgol.
	* src/Makefile.am (gpg4win_pkg_gpgol_post_install): New macro.
	* src/inst-gpgol.nsi: Install the gpgol.pdf technical
	documentation.
	* src/uninst-gpgol.nsi: Uninstall it (and many directories).


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-18 02:08:57 UTC (rev 683)
+++ trunk/ChangeLog	2008-01-18 15:22:39 UTC (rev 684)
@@ -1,5 +1,11 @@
 2008-01-18  Marcus Brinkmann  <marcus at g10code.de>
 
+	* packages/packages.current: Update gpgol.
+	* src/Makefile.am (gpg4win_pkg_gpgol_post_install): New macro.
+	* src/inst-gpgol.nsi: Install the gpgol.pdf technical
+	documentation.
+	* src/uninst-gpgol.nsi: Uninstall it (and many directories).
+
 	* packages/packages.current: Update kleopatra and kdelibs.
 
 2008-01-16  Marcus Brinkmann  <marcus at g10code.de>

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-01-18 02:08:57 UTC (rev 683)
+++ trunk/packages/packages.current	2008-01-18 15:22:39 UTC (rev 684)
@@ -215,10 +215,11 @@
 #
 # GPGol
 #
-server ftp://ftp.g10code.com/g10code/gpgol/alpha
+#server ftp://ftp.g10code.com/g10code/gpgol/alpha
+server ftp://ftp.g10code.com/g10code/scratch
 
-file gpgol-0.10.4-svn205.tar.bz2
-chk  d0f6b4eadb963c31a33a23f23b519e89c5c16b04
+file gpgol-0.10.4-svn212.tar.bz2
+chk  9fddc8851a3c007b972e2acc134d537d4aff45e4 
 
 #
 # GpgEX
@@ -369,4 +370,4 @@
 
 name kleopatra-20080117-src.zip
 file kleo-uiserver-only-20080117-src.zip
-chk  8f75b7eb0cb18631764390883ee66533c0930db3
\ No newline at end of file
+chk  8f75b7eb0cb18631764390883ee66533c0930db3

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-01-18 02:08:57 UTC (rev 683)
+++ trunk/src/Makefile.am	2008-01-18 15:22:39 UTC (rev 684)
@@ -111,6 +111,12 @@
   rm $$$${pkgidir}/share/gnupg/faq.html )
 endef
 
+
+# Build the reference manual.
+define gpg4win_pkg_gpgol_post_install
+( cd $$$${pkgndir}/doc; make pdf )
+endef
+
 # We would like to use --with-libiconv-prefix and
 # --with-libintl-prefix, but these don't work with the cheesy
 # non-"libfoo.la" versions of iconv and gettext that we are using.

Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi	2008-01-18 02:08:57 UTC (rev 683)
+++ trunk/src/inst-gpgol.nsi	2008-01-18 15:22:39 UTC (rev 684)
@@ -21,6 +21,7 @@
 !undef prefix
 !endif
 !define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
+!define bdir ${bpdir}/gpgol-${gpg4win_pkg_gpgol_version}-build
 
 
 Section "GpgOL" SEC_gpgol
@@ -46,6 +47,8 @@
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
   File ${prefix}/share/locale/de/LC_MESSAGES/gpgol.mo
 
+  SetOutPath "$INSTDIR\share\doc\gpgol"
+  File "${bdir}/doc/gpgol.pdf"
 
 !endif
 SectionEnd

Modified: trunk/src/uninst-gpgol.nsi
===================================================================
--- trunk/src/uninst-gpgol.nsi	2008-01-18 02:08:57 UTC (rev 683)
+++ trunk/src/uninst-gpgol.nsi	2008-01-18 15:22:39 UTC (rev 684)
@@ -30,8 +30,15 @@
   Call un.SourceDelete
 !else
 
+  Delete "$INSTDIR\share\doc\gpgol\gpgol.pdf"
+  RMDir "$INSTDIR\share\doc\gpgol"
+  RMDir "$INSTDIR\share\doc"
+
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpgol.mo"
   RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\de"
+  RMDir "$INSTDIR\share\locale"
+  RMDir "$INSTDIR\share\"
 
   UnRegDLL "$INSTDIR\gpgol.dll"