[Gpg4win-commits] r653 - in trunk: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Dec 21 03:33:36 CET 2007
Author: marcus
Date: 2007-12-21 03:33:36 +0100 (Fri, 21 Dec 2007)
New Revision: 653
Modified:
trunk/ChangeLog
trunk/src/inst-kleopatra.nsi
trunk/src/uninst-kleopatra.nsi
Log:
2007-12-21 Marcus Brinkmann <marcus at g10code.de>
* src/uninst-kleopatra.nsi, src/inst-kleopatra.nsi: Update to
latest version.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-21 01:48:18 UTC (rev 652)
+++ trunk/ChangeLog 2007-12-21 02:33:36 UTC (rev 653)
@@ -1,5 +1,8 @@
2007-12-21 Marcus Brinkmann <marcus at g10code.de>
+ * src/uninst-kleopatra.nsi, src/inst-kleopatra.nsi: Update to
+ latest version.
+
* packages/packages.current: Update oxygen-icons and kleopatra.
* src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi: Update
to latest version, but only install 16x16 icons (now all of them).
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2007-12-21 01:48:18 UTC (rev 652)
+++ trunk/src/inst-kleopatra.nsi 2007-12-21 02:33:36 UTC (rev 653)
@@ -35,6 +35,7 @@
SetOutPath "$INSTDIR"
File ${SRCDIR}/kleopatra.bat
+ File ${prefix}/bin/kgpgconf.exe
File ${prefix}/lib/libgpgme++-glib.dll
File ${prefix}/lib/libgpgme++-qt.dll
File ${prefix}/lib/libgpgme++.dll
@@ -51,7 +52,15 @@
SetOutPath "$INSTDIR\share\apps\kleopatra"
File ${prefix}/share/apps/kleopatra/kleopatraui.rc
+ File ${prefix}/share/apps/kleopatra/kleopatra_newui.rc
+ SetOutPath "$INSTDIR\share\apps\kleopatra\pics"
+
+ File ${prefix}/share/apps/kleopatra/pics/kleopatra_splashscreen.png
+ File ${prefix}/share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
+ File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.png
+ File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.svgz
+
SetOutPath "$INSTDIR\share\apps\libkleopatra\pics"
File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png
@@ -60,21 +69,38 @@
File ${prefix}/share/apps/libkleopatra/pics/key_ok.png
File ${prefix}/share/apps/libkleopatra/pics/key_unknown.png
+ SetOutPath "$INSTDIR\share\config"
+
+ File ${prefix}/share/config/libkleopatrarc
+
+ SetOutPath "$INSTDIR\share\icons\oxygen\128x128\apps"
+
+ File ${prefix}/share/icons/oxygen/128x128/apps/kleopatra.png
+
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\64x64\apps"
+
+ File ${prefix}/share/icons/oxygen/64x64/apps/kleopatra.png
+
+ SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"
+
+ File ${prefix}/share/icons/oxygen/48x48/apps/kleopatra.png
+
+ SetOutPath "$INSTDIR\share\icons\oxygen\scalable\apps"
+
+ File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz
+
!endif
SectionEnd
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2007-12-21 01:48:18 UTC (rev 652)
+++ trunk/src/uninst-kleopatra.nsi 2007-12-21 02:33:36 UTC (rev 653)
@@ -36,6 +36,7 @@
RMDir "$INSTDIR\bin"
Delete "$INSTDIR\kleopatra.bat"
+ Delete "$INSTDIR\kgpgconf.exe"
Delete "$INSTDIR\libgpgme++-glib.dll"
Delete "$INSTDIR\libgpgme++-qt.dll"
Delete "$INSTDIR\libgpgme++.dll"
@@ -49,6 +50,8 @@
RMDir "$INSTDIR\share\applications"
Delete "$INSTDIR\share\apps\kleopatra\kleopatraui.rc"
+ Delete "$INSTDIR\share\apps\kleopatra\kleopatra_newui.rc"
+
RMDir "$INSTDIR\share\apps\kleopatra"
Delete "$INSTDIR\share\apps\libkleopatra\pics\chiasmus_chi.png"
@@ -59,25 +62,54 @@
RMDir "$INSTDIR\share\apps\libkleopatra\pics"
RMDir "$INSTDIR\share\apps\libkleopatra"
+
+ Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_splashscreen.png"
+ Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_splashscreen.svgz"
+ Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_wizard.png"
+ Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_wizard.svgz"
+
+ RMDir "$INSTDIR\share\apps\kleopatra\pics"
RMDir "$INSTDIR\share\apps"
- Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gpg.png"
- Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gpgsm.png"
+ Delete "$INSTDIR\share\config\libkleopatrarc"
+ RMDir "$INSTDIR\share\config"
+
+ Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kleopatra.png"
+
+ RMDir "$INSTDIR\share\icons\oxygen\128x128\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\128x128"
+
+ Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kleopatra.png"
+
RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
RMDir "$INSTDIR\share\icons\oxygen\16x16"
- Delete "$INSTDIR\share\icons\oxygen\22x22\apps\gpg.png"
- Delete "$INSTDIR\share\icons\oxygen\22x22\apps\gpgsm.png"
+ Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kleopatra.png"
RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
RMDir "$INSTDIR\share\icons\oxygen\22x22"
- Delete "$INSTDIR\share\icons\oxygen\32x32\apps\gpg.png"
- Delete "$INSTDIR\share\icons\oxygen\32x32\apps\gpgsm.png"
+ Delete "$INSTDIR\share\icons\oxygen\32x32\apps\kleopatra.png"
RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
RMDir "$INSTDIR\share\icons\oxygen\32x32"
+
+ Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
+
+ RMDir "$INSTDIR\share\icons\oxygen\48x48\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\48x48"
+
+ Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
+
+ RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\64x64"
+
+ Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
+
+ RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\scalable"
+
RMDir "$INSTDIR\share\icons\oxygen"
RMDir "$INSTDIR\share\icons"
RMDir "$INSTDIR\share"
More information about the Gpg4win-commits
mailing list