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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Apr 21 10:45:22 CEST 2010


Author: emanuel
Date: 2010-04-21 10:45:21 +0200 (Wed, 21 Apr 2010)
New Revision: 1403

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/inst-kleopatra.nsi
   trunk/src/uninst-kleopatra.nsi
Log:
Updated kdelibs and kleopatra. Restructured kleopatra nsi files to reduce diff with src/pkg-to-nsi.pl script.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-21 02:28:26 UTC (rev 1402)
+++ trunk/ChangeLog	2010-04-21 08:45:21 UTC (rev 1403)
@@ -1,3 +1,10 @@
+2010-04-21  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
+
+	* packages/packages.current, src/uninst-kleopatra.nsi,
+        src/inst-kleopatra.nsi: Update kdelibs and kleopatra. 
+        Restructure kleopatra nsi files to reduce diff with src/pkg-to-nsi.pl 
+        script.
+
 2010-04-21  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update gpa, gpgol, gpgex, libassuan,

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2010-04-21 02:28:26 UTC (rev 1402)
+++ trunk/packages/packages.current	2010-04-21 08:45:21 UTC (rev 1403)
@@ -467,17 +467,17 @@
 #
 server http://files.kolab.org/local/gpg4win
 
-file kdelibs-20100303-bin.zip
-chk  e006699f6d2585e084eecc08dee5e22665f410ae
+file kdelibs-20100420-bin.zip
+chk  804debb0a5441b1398088a2f3c97df85b7fdc0f9
 
-file kdelibs-20100303-lib.zip
-chk  e0c1d72feacbe1a63bf62ff80f42925cd803cc04
+file kdelibs-20100420-lib.zip
+chk  b16ef694f53f26d74d9a8e1606ef3f0341faf7bb
 
-file kdelibs-20100303-src.zip
-chk  cd1b409119d5473c618e437377f352fada0c12db 
+file kdelibs-20100420-src.zip
+chk  7c128f6ead85708724a68a52db609249a9aa4e81 
 
-file kleopatra-20100318-bin.zip
-chk  cdf4705fc4842e015bbee6a71a30e715bab6ec57
+file kleopatra-20100420-bin.zip
+chk  2e8900f230817cbe7be12b4e69d7c36c54027f00
 
-file kleopatra-20100318-src.zip
-chk  3273411a374cda209f66b32e00ffd3f89fd2e265
+file kleopatra-20100420-src.zip
+chk  4a82936a9d8be671b05184be06f172faff079ff2 

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2010-04-21 02:28:26 UTC (rev 1402)
+++ trunk/src/inst-kleopatra.nsi	2010-04-21 08:45:21 UTC (rev 1403)
@@ -40,10 +40,14 @@
   File ${prefix}/bin/libkleo.dll
   File ${prefix}/bin/libkleopatraclientcore.dll
   File ${prefix}/bin/libkleopatraclientgui.dll
+
+  SetOutPath "$INSTDIR\lib\kde4"
+
   File ${prefix}/lib/kde4/kcm_kleopatra.dll
 
   SetOutPath "$INSTDIR\share\applications\kde4"
 
+  File ${prefix}/share/applications/kde4/kleopatra.desktop
   File ${prefix}/share/applications/kde4/kleopatra_import.desktop
 
   SetOutPath "$INSTDIR\share\apps\kleopatra"
@@ -52,12 +56,12 @@
 
   SetOutPath "$INSTDIR\share\apps\kleopatra\pics"
 
+  File ${prefix}/share/apps/kleopatra/pics/gpg4win-compact.png
+  File ${prefix}/share/apps/kleopatra/pics/gpg4win.png
   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
-  File ${prefix}/share/apps/kleopatra/pics/gpg4win.png
-  File ${prefix}/share/apps/kleopatra/pics/gpg4win-compact.png
 
   SetOutPath "$INSTDIR\share\apps\kwatchgnupg"
 
@@ -71,6 +75,12 @@
   SetOutPath "$INSTDIR\share\apps\libkleopatra\pics"
 
   File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png
+  File ${prefix}/share/apps/libkleopatra/pics/hi16-app-gpg.png
+  File ${prefix}/share/apps/libkleopatra/pics/hi16-app-gpgsm.png
+  File ${prefix}/share/apps/libkleopatra/pics/hi22-app-gpg.png
+  File ${prefix}/share/apps/libkleopatra/pics/hi22-app-gpgsm.png
+  File ${prefix}/share/apps/libkleopatra/pics/hi32-app-gpg.png
+  File ${prefix}/share/apps/libkleopatra/pics/hi32-app-gpgsm.png
   File ${prefix}/share/apps/libkleopatra/pics/key.png
   File ${prefix}/share/apps/libkleopatra/pics/key_bad.png
   File ${prefix}/share/apps/libkleopatra/pics/key_ok.png
@@ -81,47 +91,8 @@
 
   File ${prefix}/share/config/libkleopatrarc
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\apps"
+  SetOutPath "$INSTDIR\share\doc\HTML\common"
 
-  File ${prefix}/share/icons/oxygen/128x128/apps/kleopatra.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
-
-  File ${prefix}/share/icons/oxygen/16x16/apps/kleopatra.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
-
-  File ${prefix}/share/icons/oxygen/22x22/apps/kleopatra.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"
-
-  File ${prefix}/share/icons/oxygen/32x32/apps/kleopatra.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"
-
-  File ${prefix}/share/icons/oxygen/48x48/apps/kleopatra.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\apps"
-
-  File ${prefix}/share/icons/oxygen/64x64/apps/kleopatra.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\scalable\apps"
-
-  File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz
-
-  SetOutPath "$INSTDIR\share\kde4\services"
-
-  File ${prefix}/share/kde4/services/kleopatra_config_appear.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_smimevalidation.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_gnupgsystem.desktop
-  File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
-  File ${prefix}/share/kde4/services/kleopatra_decryptverifyfolders.desktop
-  File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
-  File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
-
-SetOutPath "$INSTDIR\share\doc\HTML\common"
-
   File ${prefix}/share/doc/HTML/common/1.png
   File ${prefix}/share/doc/HTML/common/10.png
   File ${prefix}/share/doc/HTML/common/2.png
@@ -222,7 +193,50 @@
   File ${prefix}/share/doc/HTML/en/kleopatra/menuview.html
   File ${prefix}/share/doc/HTML/en/kleopatra/menuwindow.html
 
+  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/kleopatra.png
+
+  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
+
+  File ${prefix}/share/icons/oxygen/22x22/apps/kleopatra.png
+
+  SetOutPath "$INSTDIR\share\icons\oxygen\256x256\apps"
+
+  File ${prefix}/share/icons/oxygen/256x256/apps/kleopatra.png
+
+  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"
+
+  File ${prefix}/share/icons/oxygen/32x32/apps/kleopatra.png
+
+  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"
+
+  File ${prefix}/share/icons/oxygen/48x48/apps/kleopatra.png
+
+  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\apps"
+
+  File ${prefix}/share/icons/oxygen/64x64/apps/kleopatra.png
+
+  SetOutPath "$INSTDIR\share\icons\oxygen\scalable\apps"
+
+  File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz
+
+  SetOutPath "$INSTDIR\share\kde4\services"
+
+  File ${prefix}/share/kde4/services/kleopatra_config_appear.desktop
+  File ${prefix}/share/kde4/services/kleopatra_config_cryptooperations.desktop
+  File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop
+  File ${prefix}/share/kde4/services/kleopatra_config_gnupgsystem.desktop
+  File ${prefix}/share/kde4/services/kleopatra_config_smimevalidation.desktop
+  File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
+  File ${prefix}/share/kde4/services/kleopatra_decryptverifyfolders.desktop
+  File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
+  File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
+  
 !endif
 ${MementoSectionEnd}
 

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2010-04-21 02:28:26 UTC (rev 1402)
+++ trunk/src/uninst-kleopatra.nsi	2010-04-21 08:45:21 UTC (rev 1403)
@@ -39,144 +39,130 @@
   RMDir "$INSTDIR\bin"
   Delete "$INSTDIR\kleopatra.exe"
 
+  Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfolders.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfiles.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfolders.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfiles.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_smimevalidation.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_config_gnupgsystem.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_smimevalidation.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_config_dirserv.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_cryptooperations.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_config_appear.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfolders.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfolders.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfiles.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfiles.desktop"
-
-  Delete "$INSTDIR\kcm_kleopatra.dll"
-  Delete "$INSTDIR\libkleo.dll"
-  Delete "$INSTDIR\kgpgconf.exe"
-  Delete "$INSTDIR\kwatchgnupg.exe"
-  Delete "$INSTDIR\libkleopatraclientcore.dll"
-  Delete "$INSTDIR\libkleopatraclientgui.dll"
-
-
-  Delete "$INSTDIR\share\doc\HTML\common\1.png"
-  Delete "$INSTDIR\share\doc\HTML\common\10.png"
-  Delete "$INSTDIR\share\doc\HTML\common\2.png"
-  Delete "$INSTDIR\share\doc\HTML\common\3.png"
-  Delete "$INSTDIR\share\doc\HTML\common\4.png"
-  Delete "$INSTDIR\share\doc\HTML\common\5.png"
-  Delete "$INSTDIR\share\doc\HTML\common\6.png"
-  Delete "$INSTDIR\share\doc\HTML\common\7.png"
-  Delete "$INSTDIR\share\doc\HTML\common\8.png"
-  Delete "$INSTDIR\share\doc\HTML\common\9.png"
-  Delete "$INSTDIR\share\doc\HTML\common\artistic-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_bottom.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_mid.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_top.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-left.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-middle.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-right.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bsd-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\doxygen.css"
-  Delete "$INSTDIR\share\doc\HTML\common\favicon.ico"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-notice.html"
-  Delete "$INSTDIR\share\doc\HTML\common\flat.css"
-  Delete "$INSTDIR\share\doc\HTML\common\footer.html"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\header.html"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-default.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde_logo.png"
-  Delete "$INSTDIR\share\doc\HTML\common\kde_logo_bg.png"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\mainfooter.html"
-  Delete "$INSTDIR\share\doc\HTML\common\mainheader.html"
-  Delete "$INSTDIR\share\doc\HTML\common\print.css"
-  Delete "$INSTDIR\share\doc\HTML\common\qpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\tabs.css"
-  Delete "$INSTDIR\share\doc\HTML\common\top-kde.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-left.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-left.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-middle.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-right.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-right.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\x11-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\xml.dcl"
-  Delete "$INSTDIR\share\doc\HTML\common\CMakeLists.txt"
-  Delete "$INSTDIR\share\doc\HTML\common\Doxyfile.global"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-docs.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css.template"
-  Delete "$INSTDIR\share\doc\HTML\common\README.Doxygen"
-
-  RMDir "$INSTDIR\share\doc\HTML\common"
-
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-key-filters.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\commandline-options.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-appearance.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-dn-order.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\credits-and-license.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-keybox-management.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-newkey.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-search.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\index.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\introduction.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menu.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucertificates.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucrls.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuhelp.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menusettings.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menutools.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuview.html"
-
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-key-filters.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\commandline-options.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-appearance.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-dn-order.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\credits-and-license.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-keybox-management.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-newkey.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-search.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\introduction.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menu.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menucertificates.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuhelp.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menusettings.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuview.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
-
-  RMDir "$INSTDIR\share\doc\HTML\de\kleopatra"
-  RMDir "$INSTDIR\share\doc\HTML\de"
-  RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
-  RMDir "$INSTDIR\share\doc\HTML\en"
-  RMDir "$INSTDIR\share\doc\HTML"
-  RMDir "$INSTDIR\share\doc"
-
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
   Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
   Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\oxygen\32x32\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\oxygen\256x256\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kleopatra.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuview.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menusettings.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuhelp.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menucertificates.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menu.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\introduction.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-search.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-newkey.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-keybox-management.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\credits-and-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-dn-order.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-appearance.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\commandline-options.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-key-filters.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuview.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menutools.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menusettings.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuhelp.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucrls.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucertificates.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menu.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\introduction.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\index.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-search.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-newkey.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-keybox-management.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\credits-and-license.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-dn-order.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-appearance.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\commandline-options.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-key-filters.html"
+  Delete "$INSTDIR\share\doc\HTML\common\xml.dcl"
+  Delete "$INSTDIR\share\doc\HTML\common\x11-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\top.jpg"
+  Delete "$INSTDIR\share\doc\HTML\common\top-right.png"
+  Delete "$INSTDIR\share\doc\HTML\common\top-right.jpg"
+  Delete "$INSTDIR\share\doc\HTML\common\top-middle.png"
+  Delete "$INSTDIR\share\doc\HTML\common\top-left.png"
+  Delete "$INSTDIR\share\doc\HTML\common\top-left.jpg"
+  Delete "$INSTDIR\share\doc\HTML\common\top-kde.jpg"
+  Delete "$INSTDIR\share\doc\HTML\common\tabs.css"
+  Delete "$INSTDIR\share\doc\HTML\common\qpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\print.css"
+  Delete "$INSTDIR\share\doc\HTML\common\mainheader.html"
+  Delete "$INSTDIR\share\doc\HTML\common\mainfooter.html"
+  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license"
+  Delete "$INSTDIR\share\doc\HTML\common\kde_logo_bg.png"
+  Delete "$INSTDIR\share\doc\HTML\common\kde_logo.png"
+  Delete "$INSTDIR\share\doc\HTML\common\kde.css"
+  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css.template"
+  Delete "$INSTDIR\share\doc\HTML\common\kde-docs.css"
+  Delete "$INSTDIR\share\doc\HTML\common\kde-default.css"
+  Delete "$INSTDIR\share\doc\HTML\common\header.html"
+  Delete "$INSTDIR\share\doc\HTML\common\gpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\gpl-license"
+  Delete "$INSTDIR\share\doc\HTML\common\footer.html"
+  Delete "$INSTDIR\share\doc\HTML\common\flat.css"
+  Delete "$INSTDIR\share\doc\HTML\common\fdl-notice.html"
+  Delete "$INSTDIR\share\doc\HTML\common\fdl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\fdl-license"
+  Delete "$INSTDIR\share\doc\HTML\common\favicon.ico"
+  Delete "$INSTDIR\share\doc\HTML\common\doxygen.css"
+  Delete "$INSTDIR\share\doc\HTML\common\bsd-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\bottom-right.png"
+  Delete "$INSTDIR\share\doc\HTML\common\bottom-middle.png"
+  Delete "$INSTDIR\share\doc\HTML\common\bottom-left.png"
+  Delete "$INSTDIR\share\doc\HTML\common\block_title_top.png"
+  Delete "$INSTDIR\share\doc\HTML\common\block_title_mid.png"
+  Delete "$INSTDIR\share\doc\HTML\common\block_title_bottom.png"
+  Delete "$INSTDIR\share\doc\HTML\common\artistic-license.html"
+  Delete "$INSTDIR\share\doc\HTML\common\README.Doxygen"
+  Delete "$INSTDIR\share\doc\HTML\common\Doxyfile.global"
+  Delete "$INSTDIR\share\doc\HTML\common\CMakeLists.txt"
+  Delete "$INSTDIR\share\doc\HTML\common\9.png"
+  Delete "$INSTDIR\share\doc\HTML\common\8.png"
+  Delete "$INSTDIR\share\doc\HTML\common\7.png"
+  Delete "$INSTDIR\share\doc\HTML\common\6.png"
+  Delete "$INSTDIR\share\doc\HTML\common\5.png"
+  Delete "$INSTDIR\share\doc\HTML\common\4.png"
+  Delete "$INSTDIR\share\doc\HTML\common\3.png"
+  Delete "$INSTDIR\share\doc\HTML\common\2.png"
+  Delete "$INSTDIR\share\doc\HTML\common\10.png"
+  Delete "$INSTDIR\share\doc\HTML\common\1.png"
   Delete "$INSTDIR\share\config\libkleopatrarc"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\smartcard.xpm"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_ok.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_bad.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key.png"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi32-app-gpgsm.png"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi32-app-gpg.png"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi22-app-gpgsm.png"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi22-app-gpg.png"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi16-app-gpgsm.png"
+  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi16-app-gpg.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\chiasmus_chi.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\smartcard.xpm"
-
   Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg2.png"
   Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg.png"
   Delete "$INSTDIR\share\apps\kwatchgnupg\kwatchgnupgui.rc"
@@ -188,10 +174,15 @@
   Delete "$INSTDIR\share\apps\kleopatra\pics\gpg4win-compact.png"
   Delete "$INSTDIR\share\apps\kleopatra\kleopatra.rc"
   Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
-
-  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\de"
-  RMDir "$INSTDIR\share\locale"
+  Delete "$INSTDIR\share\applications\kde4\kleopatra.desktop"
+  Delete "$INSTDIR\kcm_kleopatra.dll"
+  Delete "$INSTDIR\libkleopatraclientgui.dll"
+  Delete "$INSTDIR\libkleopatraclientcore.dll"
+  Delete "$INSTDIR\libkleo.dll"
+  Delete "$INSTDIR\kwatchgnupg.exe"
+  Delete "$INSTDIR\kgpgconf.exe"
+  RMDir "$INSTDIR\share\kde4\services"
+  RMDir "$INSTDIR\share\kde4"
   RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
   RMDir "$INSTDIR\share\icons\oxygen\scalable"
   RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"
@@ -200,6 +191,8 @@
   RMDir "$INSTDIR\share\icons\oxygen\48x48"
   RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
   RMDir "$INSTDIR\share\icons\oxygen\32x32"
+  RMDir "$INSTDIR\share\icons\oxygen\256x256\apps"
+  RMDir "$INSTDIR\share\icons\oxygen\256x256"
   RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
   RMDir "$INSTDIR\share\icons\oxygen\22x22"
   RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
@@ -208,18 +201,30 @@
   RMDir "$INSTDIR\share\icons\oxygen\128x128"
   RMDir "$INSTDIR\share\icons\oxygen"
   RMDir "$INSTDIR\share\icons"
+  RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
+  RMDir "$INSTDIR\share\doc\HTML\en"
+  RMDir "$INSTDIR\share\doc\HTML\de\kleopatra"
+  RMDir "$INSTDIR\share\doc\HTML\de"
+  RMDir "$INSTDIR\share\doc\HTML\common"
+  RMDir "$INSTDIR\share\doc\HTML"
+  RMDir "$INSTDIR\share\doc"
   RMDir "$INSTDIR\share\config"
   RMDir "$INSTDIR\share\apps\libkleopatra\pics"
   RMDir "$INSTDIR\share\apps\libkleopatra"
+  RMDir "$INSTDIR\share\apps\kwatchgnupg\pics"
+  RMDir "$INSTDIR\share\apps\kwatchgnupg"
   RMDir "$INSTDIR\share\apps\kleopatra\pics"
   RMDir "$INSTDIR\share\apps\kleopatra"
-  RMDir "$INSTDIR\share\apps\kwatchgnupg\pics"
-  RMDir "$INSTDIR\share\apps\kwatchgnupg"
   RMDir "$INSTDIR\share\apps"
   RMDir "$INSTDIR\share\applications\kde4"
   RMDir "$INSTDIR\share\applications"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR\lib\kde4"
+  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR\bin"
+  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\de"
+  RMDir "$INSTDIR\share\locale"
   RMDir "$INSTDIR"
 
 !endif



More information about the Gpg4win-commits mailing list