2008-02-26 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 26 Feb 2008 16:39:29 +0000 (16:39 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 26 Feb 2008 16:39:29 +0000 (16:39 +0000)
* packages/packages.current: Update gpgol, kdelibs, kleopatra.
* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.

ChangeLog
packages/packages.current
src/inst-kdelibs.nsi
src/inst-kleopatra.nsi
src/uninst-kdelibs.nsi
src/uninst-kleopatra.nsi

index 07865ab..edfa646 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-26  Marcus Brinkmann  <marcus@g10code.de>
 
+       * packages/packages.current: Update gpgol, kdelibs, kleopatra.
+       * src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
+       src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.
+
        * patches/winpt/01-gpg-path.patch: New file.
        * Makefile.am (EXTRA_DIST): Add this file.
 
index 5ebf782..844e672 100644 (file)
@@ -215,11 +215,11 @@ chk   050f93a0d74385ce90e8934e49c11f171d495c5a
 #
 # GPGol
 #
-server ftp://ftp.g10code.com/g10code/gpgol/alpha
-#server ftp://ftp.g10code.com/g10code/scratch
+#server ftp://ftp.g10code.com/g10code/gpgol/alpha
+server ftp://ftp.g10code.com/g10code/scratch
 
-file gpgol-0.10.5.tar.bz2
-chk  7ce14398a8cf4cd88651c9ff8a2c1a223fa25bf2
+file gpgol-0.10.6-svn224.tar.bz2
+chk  5663e2f0776a4e96788509efb03cddaa6d5e6daa
 
 
 #
@@ -358,27 +358,25 @@ chk  ced2b1f3b111cf7f6cc28c4f7863a29cda05114b
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kdelibs-20080215-bin.zip
-file kdelibs-for-kleo-20080215-bin.zip
-chk  49d1f8b3e2873098e4d27b6c5602996ac0f0d6f3
+name kdelibs-20080226-bin.zip
+file kdelibs-for-kleo-20080226-bin.zip
+chk  0a6ba94b9290ddebb210544c1974b37775ea6fc8
 
-name kdelibs-20080215-lib.zip
-file kdelibs-for-kleo-20080215-dev.zip
-chk  3100ce9fee65b878a4cb695d3cab95cace3a577d
+name kdelibs-20080226-lib.zip
+file kdelibs-for-kleo-20080226-dev.zip
+chk  0b19156c1fbcc693accc490ea46dd8e5c0085fcf
 
-name kdelibs-20080215-src.zip
-file kdelibs-for-kleo-20080215-src.zip
-chk  fd4bb91b99d606a0cc947c36c524cb9960a255fe
+name kdelibs-20080226-src.zip
+file kdelibs-for-kleo-20080226-src.zip
+chk  1cda186481ed8deaeee3bfaa1b61b75ccc4b8f16
 
 
 # Kleopatra
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kleopatra-20080215-bin.zip
-file kleo-uiserver-only-20080215-bin.zip
-chk  2024b3e0a5ef13af83df1051934fefd0fbcf2afc
+file kleopatra-20080226-bin.zip
+chk  d972a9a4ec3616a57d4512d8236efef3affc667c
 
-name kleopatra-20080215-src.zip
-file kleo-uiserver-only-20080215-src.zip
-chk  797f3403396467c822bf26adf09f61a25fcdc0c5
+file kleopatra-20080226-src.zip
+chk  581bf44c5a60d584b9f36dbab30ff4fc6dda4b87
index 71d2ee7..f08c083 100644 (file)
@@ -1,5 +1,5 @@
 # inst-kdelibs.nsi - Installer snippet for kdelibs.      -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -38,9 +38,20 @@ Section "-kdelibs" SEC_kdelibs
   File ${prefix}/bin/kcmdwrapper.exe
   SetOutPath "$INSTDIR"
 
-  File ${prefix}/bin/libkdecore.dll
-  File ${prefix}/bin/libkdeui.dll
-#  File ${prefix}/bin/libkdefx.dll
+  File ${prefix}/bin/kbuildsycoca4.exe
+  File ${prefix}/bin/libgpgme++-glib.dll
+  File ${prefix}/bin/libgpgme++-qt.dll
+  File ${prefix}/bin/libgpgme++.dll
+  File ${prefix}/bin/libkmime.dll
+  File ${prefix}/bin/libqgpgme.dll
+  File ${prefix}/lib/libkcmutils.dll
+  File ${prefix}/lib/libkdecore.dll
+  File ${prefix}/lib/libkdeinit4_kbuildsycoca4.dll
+  File ${prefix}/lib/libkdeui.dll
+
+  SetOutPath "$INSTDIR\etc\xdg\menus"
+
+  File ${prefix}/etc/xdg/menus/applications.menu
 
   SetOutPath "$INSTDIR\lib\kde4"
 
@@ -50,49 +61,49 @@ Section "-kdelibs" SEC_kdelibs
 
   File ${prefix}/share/apps/kcharselect/kcharselect-data
 
-  SetOutPath "$INSTDIR\share\apps\kdeui\pics"
-
-#  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
-
   SetOutPath "$INSTDIR\share\apps\kdeui\about"
 
-  File ${prefix}/share/apps/kdeui/about/box-middle-left.png
-  File ${prefix}/share/apps/kdeui/about/bottom-right.png
-  File ${prefix}/share/apps/kdeui/about/bar-middle-left.png
   File ${prefix}/share/apps/kdeui/about/bar-bottom-left.png
-  File ${prefix}/share/apps/kdeui/about/box-top-right.png
   File ${prefix}/share/apps/kdeui/about/bar-bottom-middle.png
   File ${prefix}/share/apps/kdeui/about/bar-bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/bar-middle-left.png
+  File ${prefix}/share/apps/kdeui/about/bar-middle-right.png
+  File ${prefix}/share/apps/kdeui/about/bar-top-left.png
   File ${prefix}/share/apps/kdeui/about/bar-top-middle.png
-  File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/bar-top-right.png
+  File ${prefix}/share/apps/kdeui/about/bottom-left.png
+  File ${prefix}/share/apps/kdeui/about/bottom-middle.png
+  File ${prefix}/share/apps/kdeui/about/bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
   File ${prefix}/share/apps/kdeui/about/box-bottom-middle.png
-  File ${prefix}/share/apps/kdeui/about/bar-middle-right.png
+  File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
+  File ${prefix}/share/apps/kdeui/about/box-middle-left.png
   File ${prefix}/share/apps/kdeui/about/box-middle-right.png
+  File ${prefix}/share/apps/kdeui/about/box-top-left.png
+  File ${prefix}/share/apps/kdeui/about/box-top-middle.png
+  File ${prefix}/share/apps/kdeui/about/box-top-right.png
   File ${prefix}/share/apps/kdeui/about/kde_infopage.css
-  File ${prefix}/share/apps/kdeui/about/bottom-middle.png
-  File ${prefix}/share/apps/kdeui/about/bar-top-left.png
   File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
-  File ${prefix}/share/apps/kdeui/about/top-middle.png
-  File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
-  File ${prefix}/share/apps/kdeui/about/bar-top-right.png
-  File ${prefix}/share/apps/kdeui/about/box-top-left.png
   File ${prefix}/share/apps/kdeui/about/top-left.png
-  File ${prefix}/share/apps/kdeui/about/box-top-middle.png
-  File ${prefix}/share/apps/kdeui/about/bottom-left.png
+  File ${prefix}/share/apps/kdeui/about/top-middle.png
 
-  SetOutPath "$INSTDIR\share\config"
+  SetOutPath "$INSTDIR\share\apps\kdeui\pics"
 
-  File ${prefix}/share/config/kdebug.areas
-  File ${prefix}/share/config/kdebugrc
+  File ${prefix}/share/apps/kdeui/pics/aboutkde.png
+  File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
 
   SetOutPath "$INSTDIR\share\config\colors"
 
-  File ${prefix}/share/config/colors/Web.colors
-  File ${prefix}/share/config/colors/Royal.colors
-  File ${prefix}/share/config/colors/Rainbow.colors
   File ${prefix}/share/config/colors/40.colors
+  File ${prefix}/share/config/colors/Oxygen.colors
+  File ${prefix}/share/config/colors/Rainbow.colors
+  File ${prefix}/share/config/colors/Royal.colors
+  File ${prefix}/share/config/colors/Web.colors
+
+  SetOutPath "$INSTDIR\share\config"
+
+  File ${prefix}/share/config/kdebug.areas
+  File ${prefix}/share/config/kdebugrc
 
   SetOutPath "$INSTDIR\share\config\ui"
 
@@ -104,8 +115,8 @@ Section "-kdelibs" SEC_kdelibs
 
   SetOutPath "$INSTDIR\share\kde4\servicetypes"
 
-  File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
   File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
+  File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
 
   SetOutPath "$INSTDIR\share\locale"
 
index 54d6475..5fc4722 100644 (file)
@@ -36,13 +36,12 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File /oname=kleopatra.exe "${BUILD_DIR}/kleowrap.exe"
 
   File ${prefix}/bin/kgpgconf.exe
-  File ${prefix}/lib/libgpgme++-glib.dll
-  File ${prefix}/lib/libgpgme++-qt.dll
-  File ${prefix}/lib/libgpgme++.dll
-  File ${prefix}/bin/libqgpgme.dll
-  File ${prefix}/bin/libkmime.dll
   File ${prefix}/bin/libkleo.dll
 
+  SetOutPath "$INSTDIR\lib\kde4"
+
+  File ${prefix}/lib/kde4/kcm_kleopatra.dll
+
   SetOutPath "$INSTDIR\share\applications\kde4"
 
   File ${prefix}/share/applications/kde4/kleopatra_import.desktop
@@ -99,6 +98,88 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   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_dnorder.desktop
+  File ${prefix}/share/kde4/services/kleopatra_config_smimevalidation.desktop
+
+  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+
+  File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepim.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kabc2mutt.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kabc_slox.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kabcakonadi.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kabcclient.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kalarm.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcm_phonon.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcmkabconfig.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcmkontactnt.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdepimresources.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdepimwizards.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdgantt1.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kfile_vcf.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kio_groupwise.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kitchensync.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmail.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_calendar_plugin.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_vcard_plugin.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_xdiff_plugin.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmailcvt.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools_at_engine.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/knode.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/knotes.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kode.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/konsolekalendar.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kontact.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/korganizer.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/korn.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kpilot.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_birthday.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_blog.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_featureplan.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupware.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupwise.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_kolab.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_remote.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_scalix.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_tvanytime.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kres_xmlrpc.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/ktimetracker.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/ktnef.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kwatchgnupg.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kxforms.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libakonadi.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libkdepim.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libkholidays.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libkleopatra.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libkpgp.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libksieve.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/libphonon.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
+
+  SetOutPath "$INSTDIR\share\locale\de"
+
+  File ${prefix}/share/locale/de/entry.desktop
+
 !endif
 ${MementoSectionEnd}
 
index be86cf2..3a13ecb 100644 (file)
@@ -1,5 +1,5 @@
 # uninst-kdelibs.nsi - Installer snippet for kdelibs.    -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -34,84 +34,78 @@ Section "-un.kdelibs"
   # FIXME: See inst-kleopatra.nsi
   Delete "$INSTDIR\bin\kcmdwrapper.exe"
   RMDir "$INSTDIR\bin"
-  Delete "$INSTDIR\libkdecore.dll"
-  Delete "$INSTDIR\libkdeui.dll"
-  Delete "$INSTDIR\libkdefx.dll"
-
-  Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
-
-  RMDir "$INSTDIR\lib\kde4"
-  RMDir "$INSTDIR\lib"
 
-  Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
-
-  RMDir "$INSTDIR\share\apps\kcharselect"
+  Delete "$INSTDIR\libkdeui.dll"
+  Delete "$INSTDIR\libkdeinit4_kbuildsycoca4.dll"
+  Delete "$INSTDIR\libkdecore.dll"
+  Delete "$INSTDIR\libkcmutils.dll"
+  Delete "$INSTDIR\libqgpgme.dll"
+  Delete "$INSTDIR\libkmime.dll"
+  Delete "$INSTDIR\libgpgme++.dll"
+  Delete "$INSTDIR\libgpgme++-qt.dll"
+  Delete "$INSTDIR\libgpgme++-glib.dll"
+  Delete "$INSTDIR\kbuildsycoca4.exe"
 
-  Delete "$INSTDIR\share\apps\kdeui\pics\ktip-background.png"
-  Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
+  Delete "$INSTDIR\share\locale\all_languages"
+  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
+  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
+  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
+  Delete "$INSTDIR\share\config\ui\ui_standards.rc"
+  Delete "$INSTDIR\share\config\kdebugrc"
+  Delete "$INSTDIR\share\config\kdebug.areas"
+  Delete "$INSTDIR\share\config\colors\Web.colors"
+  Delete "$INSTDIR\share\config\colors\Royal.colors"
+  Delete "$INSTDIR\share\config\colors\Rainbow.colors"
+  Delete "$INSTDIR\share\config\colors\Oxygen.colors"
+  Delete "$INSTDIR\share\config\colors\40.colors"
   Delete "$INSTDIR\share\apps\kdeui\pics\ktip-bulb.png"
-
-  RMDir "$INSTDIR\share\apps\kdeui\pics"
-  RMDir "$INSTDIR\share\apps\kdeui"
-
-  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
+  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
   Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-left.png"
   Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-right.png"
   Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
-  Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
   Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-top-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\top-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
   Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-right.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
+  Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
+  Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
+  Delete "$INSTDIR\etc\xdg\menus\applications.menu"
 
-  RMDir "$INSTDIR\share\apps\kdeui\about"
-  RMDir "$INSTDIR\share\apps\kdeui"
-  RMDir "$INSTDIR\share\apps"
-
-  Delete "$INSTDIR\share\config\kdebug.areas"
-  Delete "$INSTDIR\share\config\kdebugrc"
-
-  Delete "$INSTDIR\share\config\colors\Web.colors"
-  Delete "$INSTDIR\share\config\colors\Royal.colors"
-  Delete "$INSTDIR\share\config\colors\Rainbow.colors"
-  Delete "$INSTDIR\share\config\colors\40.colors"
-
-  RMDir "$INSTDIR\share\config\colors"
-
-  Delete "$INSTDIR\share\config\ui\ui_standards.rc"
-
-  RMDir "$INSTDIR\share\config\ui"
-  RMDir "$INSTDIR\share\config"
-
-  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
-
+  RMDir "$INSTDIR\share\locale"
+  RMDir "$INSTDIR\share\kde4\servicetypes"
   RMDir "$INSTDIR\share\kde4\services\kded"
   RMDir "$INSTDIR\share\kde4\services"
-
-  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
-  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
-
-  RMDir "$INSTDIR\share\kde4\servicetypes"
   RMDir "$INSTDIR\share\kde4"
-
-  Delete "$INSTDIR\share\locale\all_languages"
-
-  RMDir "$INSTDIR\share\locale"
+  RMDir "$INSTDIR\share\config\ui"
+  RMDir "$INSTDIR\share\config\colors"
+  RMDir "$INSTDIR\share\config"
+  RMDir "$INSTDIR\share\apps\kdeui\pics"
+  RMDir "$INSTDIR\share\apps\kdeui\about"
+  RMDir "$INSTDIR\share\apps\kdeui"
+  RMDir "$INSTDIR\share\apps\kcharselect"
+  RMDir "$INSTDIR\share\apps"
   RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR\lib\kde4"
+  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR\etc\xdg\menus"
+  RMDir "$INSTDIR\etc\xdg"
+  RMDir "$INSTDIR\etc"
   RMDir "$INSTDIR"
 
 !endif
index 576699d..1de639e 100644 (file)
@@ -36,26 +36,85 @@ Section "-un.kleopatra"
   RMDir "$INSTDIR\bin"
   Delete "$INSTDIR\kleopatra.exe"
 
-  Delete "$INSTDIR\kgpgconf.exe"
-  Delete "$INSTDIR\libgpgme++-glib.dll"
-  Delete "$INSTDIR\libgpgme++-qt.dll"
-  Delete "$INSTDIR\libgpgme++.dll"
-  Delete "$INSTDIR\libqgpgme.dll"
-  Delete "$INSTDIR\libkmime.dll"
-  Delete "$INSTDIR\libkleo.dll"
-
+  Delete "$INSTDIR\share\locale\de\entry.desktop"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\phonon_kde.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libphonon.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktnef.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktimetracker.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditorkabcbridge_plugin.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditor_plugins.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_xmlrpc.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_tvanytime.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_scalix.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_remote.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_kolab.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupwise.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupware.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_featureplan.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_blog.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_birthday.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knotes.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knode.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools_at_engine.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmailcvt.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_xdiff_plugin.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_vcard_plugin.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfileaudiopreview4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfile_vcf.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdgantt1.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimwizards.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimresources.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs_colors4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkontactnt.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkabconfig.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmcrypto.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcm_phonon.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcertpart.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcakonadi.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_slox.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
+  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_appear.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\32x32\apps\gpgsm.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\apps\gpg.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\gpgsm.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\gpg.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gpgsm.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gpg.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kleopatra.png"
   Delete "$INSTDIR\share\config\libkleopatrarc"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
@@ -70,7 +129,15 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\apps\kleopatra\kleopatraui.rc"
   Delete "$INSTDIR\share\apps\kleopatra\kleopatra_newui.rc"
   Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
+  Delete "$INSTDIR\lib\kde4\kcm_kleopatra.dll"
+  Delete "$INSTDIR\libkleo.dll"
+  Delete "$INSTDIR\kgpgconf.exe"
 
+  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\de"
+  RMDir "$INSTDIR\share\locale"
+  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"
@@ -96,6 +163,7 @@ Section "-un.kleopatra"
   RMDir "$INSTDIR\share\applications\kde4"
   RMDir "$INSTDIR\share\applications"
   RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR\lib\kde4"
   RMDir "$INSTDIR"
 
 !endif