[Gpg4win-commits] r675 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun Jan 13 17:28:51 CET 2008
Author: marcus
Date: 2008-01-13 17:28:51 +0100 (Sun, 13 Jan 2008)
New Revision: 675
Modified:
trunk/ChangeLog
trunk/packages/packages.current
trunk/src/inst-gnupg2.nsi
trunk/src/inst-kdelibs.nsi
trunk/src/inst-kdesupport.nsi
trunk/src/inst-kleopatra.nsi
trunk/src/uninst-gnupg2.nsi
trunk/src/uninst-kdesupport.nsi
trunk/src/uninst-qt.nsi
Log:
2008-01-13 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Update kdelibs, kdesupport, kleopatra.
* src/inst-kdelibs.nsi: Update to latest version.
* src/inst-kdesupport.nsi: Update to latest version.
* src/uninst-kdesupport.nsi: Update to latest version.
* src/inst-kleopatra.nsi: Update to latest version.
* src/inst-gnupg2.nsi: Fix last change.
* src/uninst-gnupg2.nsi: Uninstall gpgconf-conf.skel.
* src/uninst-qt.nsi: Uninstall qsqlited4.dll.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/ChangeLog 2008-01-13 16:28:51 UTC (rev 675)
@@ -1,3 +1,17 @@
+2008-01-13 Marcus Brinkmann <marcus at g10code.de>
+
+ * packages/packages.current: Update kdelibs, kdesupport, kleopatra.
+
+ * src/inst-kdelibs.nsi: Update to latest version.
+ * src/inst-kdesupport.nsi: Update to latest version.
+ * src/uninst-kdesupport.nsi: Update to latest version.
+ * src/inst-kleopatra.nsi: Update to latest version.
+
+ * src/inst-gnupg2.nsi: Fix last change.
+ * src/uninst-gnupg2.nsi: Uninstall gpgconf-conf.skel.
+
+ * src/uninst-qt.nsi: Uninstall qsqlited4.dll.
+
2008-01-10 Marcus Brinkmann <marcus at g10code.de>
* src/gpg4win.nsi: New variable bpdir.
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/packages/packages.current 2008-01-13 16:28:51 UTC (rev 675)
@@ -315,16 +315,16 @@
server ftp://ftp.kdab.net/pub/gpg4win
-file kdesupport-4.0.0-2-bin.zip
-chk 03514b4007a0b7edbed2dd5157d60be11009745c
+file kdesupport-4.0.0-3-bin.zip
+chk 3f853554066e49cd2f91f82215cfce72edbebb14
# FIXME: This does not actually contain the development files, but
# further binary files we need.
-file kdesupport-4.0.0-2-lib.zip
-chk 78a5d914fa232e85dddd26ef102d6b309111037f
+file kdesupport-4.0.0-3-lib.zip
+chk 92ed0b77f4bcf7faae0924c92d382c64804686a1
-file kdesupport-4.0.0-2-src.zip
-chk 40318619764a5c0ae9aa3796a6f33155d0a90c0d
+file kdesupport-4.0.0-3-src.zip
+chk 8a23a3ba8158b64cd5362cf88a58cd44be8a8b73
# oxygen-icons
#
@@ -343,27 +343,27 @@
server ftp://ftp.kdab.net/pub/gpg4win
-name kdelibs-20071107-bin.zip
-file kdelibs-for-kleo-20071107-bin.zip
-chk e9fb367f2348051df51e051642bd9121e98bfb0a
+name kdelibs-20080109-bin.zip
+file kdelibs-for-kleo-20080109-bin.zip
+chk b4d5599b6b3d769896de87df2296c10e536cdcd6
-name kdelibs-20071107-lib.zip
-file kdelibs-for-kleo-20071107-dev.zip
-chk 7977bb7028d0996dcda53d156e1d1c81adb2d8a7
+name kdelibs-20080109-lib.zip
+file kdelibs-for-kleo-20080109-dev.zip
+chk 43608aabe4b9f56ae88e87ffcce14aa814429914
-name kdelibs-20071107-src.zip
-file kdelibs-for-kleo-20071107-src.zip
-chk 6d765b4168593df6450385c51f52f7494ca80169
+name kdelibs-20080109-src.zip
+file kdelibs-for-kleo-20080109-src.zip
+chk cd12ddcb0e4378f53a6b73541671bae8ca161eba
# Kleopatra
server ftp://ftp.kdab.net/pub/gpg4win
-name kleopatra-20080104-bin.zip
-file kleo-uiserver-only-20080104-bin.zip
-chk 3e39274b4ed0f4ab41ebd4b67a7040a846d68655
+name kleopatra-20080111-bin.zip
+file kleo-uiserver-only-20080111-bin.zip
+chk d85838ad405274586455579ae78ee79b5c9271c2
-name kleopatra-20080104-src.zip
-file kleo-uiserver-only-20080104-src.zip
-chk 840a18ead8a1ca12ae3f72e9254e8084c8a63799
+name kleopatra-20080111-src.zip
+file kleo-uiserver-only-20080111-src.zip
+chk 6ab0b8b7c6b7e9e00d8429d6910b8c6f980dbca7
Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/inst-gnupg2.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -70,7 +70,7 @@
File "${prefix}/share/gnupg/gpg-conf.skel"
SetOutPath "$INSTDIR\etc\gnupg"
- File /oname=gpgconf-conf.skel "${source}/share/gnupg/gpgconf.conf"
+ File /oname=gpgconf-conf.skel "${source}/doc/examples/gpgconf.conf"
# Install the language files for gpg. Note that the PO files are
# required to be UTF-8 encoded and that the post-install macro in
Modified: trunk/src/inst-kdelibs.nsi
===================================================================
--- trunk/src/inst-kdelibs.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/inst-kdelibs.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -48,7 +48,7 @@
SetOutPath "$INSTDIR\share\apps\kdeui\pics"
- File ${prefix}/share/apps/kdeui/pics/ktip-background.png
+# File ${prefix}/share/apps/kdeui/pics/ktip-background.png
File ${prefix}/share/apps/kdeui/pics/aboutkde.png
File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
Modified: trunk/src/inst-kdesupport.nsi
===================================================================
--- trunk/src/inst-kdesupport.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/inst-kdesupport.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -38,6 +38,7 @@
SetOutPath "$INSTDIR"
File ${prefix}/bin/dbus-launch.exe
+ File ${prefix}/bin/dbus-env.bat
File ${prefix}/bin/dbus-monitor.exe
File ${prefix}/bin/dbus-send.exe
File ${prefix}/bin/pcregrep.exe
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/inst-kleopatra.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -77,20 +77,14 @@
SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
- File ${prefix}/share/icons/oxygen/16x16/apps/gpg.png
- File ${prefix}/share/icons/oxygen/16x16/apps/gpgsm.png
File ${prefix}/share/icons/oxygen/16x16/apps/kleopatra.png
SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
- File ${prefix}/share/icons/oxygen/22x22/apps/gpg.png
- File ${prefix}/share/icons/oxygen/22x22/apps/gpgsm.png
File ${prefix}/share/icons/oxygen/22x22/apps/kleopatra.png
SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"
- File ${prefix}/share/icons/oxygen/32x32/apps/gpg.png
- File ${prefix}/share/icons/oxygen/32x32/apps/gpgsm.png
File ${prefix}/share/icons/oxygen/32x32/apps/kleopatra.png
SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"
Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/uninst-gnupg2.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -54,9 +54,16 @@
Delete "$INSTDIR\share\gnupg\com-certs.pem"
Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
RMDir "$INSTDIR\share\gnupg"
+ RMDir "$INSTDIR\share"
+ Delete "$INSTDIR\etc\gnupg\gpgconf-conf.skel"
+ RMDir "$INSTDIR\etc\gnupg"
+ RMDir "$INSTDIR\etc"
+
# Delete "$INSTDIR\gnupg.nls\de.mo"
# RMDir "$INSTDIR\gnupg.nls"
+ RMDir "$INSTDIR"
+
!endif
SectionEnd
Modified: trunk/src/uninst-kdesupport.nsi
===================================================================
--- trunk/src/uninst-kdesupport.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/uninst-kdesupport.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -34,6 +34,7 @@
Delete "$INSTDIR\bin\dbus-daemon.exe"
RMDir "$INSTDIR\bin"
+ Delete "$INSTDIR\dbus-env.bat"
Delete "$INSTDIR\dbus-launch.exe"
Delete "$INSTDIR\dbus-monitor.exe"
Delete "$INSTDIR\dbus-send.exe"
Modified: trunk/src/uninst-qt.nsi
===================================================================
--- trunk/src/uninst-qt.nsi 2008-01-10 16:00:01 UTC (rev 674)
+++ trunk/src/uninst-qt.nsi 2008-01-13 16:28:51 UTC (rev 675)
@@ -107,6 +107,10 @@
RMDir "$INSTDIR\plugins\plugins\imageformats"
+ Delete "$INSTDIR\plugins\plugins\sqldrivers\qsqlited4.dll"
+
+ RMDir "$INSTDIR\plugins\plugins\sqldrivers"
+
Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
RMDir "$INSTDIR\plugins\sqldrivers"
More information about the Gpg4win-commits
mailing list