Updated kdelibs and kleopatra (with handbook html files and smart card icon).
authorEmanuel Schuetze <emanuel.schuetze@intevation.de>
Mon, 3 Aug 2009 13:44:56 +0000 (13:44 +0000)
committerEmanuel Schuetze <emanuel.schuetze@intevation.de>
Mon, 3 Aug 2009 13:44:56 +0000 (13:44 +0000)
ChangeLog
packages/packages.current
src/inst-kleopatra.nsi
src/uninst-kleopatra.nsi

index 0ec6c66..ad774f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-03  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
+
+       * src/uninst-kleopatra.nsi, src/inst-kleopatra.nsi:
+         Add smarcard icon and kleopatra handbook (HTML).
+       * packages/packages.current: Update kleopatra and kdelibs.
+
 2009-07-31  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
 
        * po/de.po: Fix typo in german installer.
index 38835a5..9832940 100644 (file)
@@ -314,7 +314,7 @@ server http://wald.intevation.org/frs/download.php
 server ftp://ftp.g10code.com/g10code/gpgol
 
 file gpgol-1.0.0.tar.bz2
-chk  b5ceb5e8854dd9508d5fcff40f4d57c1f6196b90  
+chk  b5ceb5e8854dd9508d5fcff40f4d57c1f6196b90
 
 #
 # GpgEX
@@ -373,7 +373,7 @@ file pinentry/pinentry-0.7.6.tar.gz
 chk  0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
 
 file scute/scute-1.3.0.tar.bz2
-chk  0d20924a5411a6699f54ced11128029dedff3211  
+chk  0d20924a5411a6699f54ced11128029dedff3211
 
 # (Snapshots)
 # server ftp://ftp.g10code.com/g10code/scratch
@@ -401,7 +401,7 @@ chk  6255a7958dc9e735c3f76595cd973abca09c1f93
 server http://wald.intevation.org/frs/download.php
 
 file 603/gpa-0.9.0.tar.bz2
-chk  ce7e6c5d34c7a1a5066f367f2b890c24197ea073 
+chk  ce7e6c5d34c7a1a5066f367f2b890c24197ea073
 
 
 #
@@ -464,17 +464,17 @@ chk  a4e673c1b1b1cc420e771413edc53ef89fe7773a
 #
 server http://files.kolab.org/local/gpg4win
 
-file kdelibs-20090622-2-bin.zip
-chk  e003b40257546577aaad6a1f992035aadf786202
+file kdelibs-20090803-bin.zip
+chk  903c9e601f160ed86fb211246d0ac21e2496c9d5
 
-file kdelibs-20090622-2-lib.zip
-chk  df8d1bf8bcaf020fd0dc116f99884b4a8820b51d
+file kdelibs-20090803-lib.zip
+chk  18724d98716a7694e83f4f2bcb699515c345a2c0
 
-file kdelibs-20090622-2-src.zip
-chk  43276c8db406710384228baed98a7e8a3f1f4ca7
+file kdelibs-20090803-src.zip
+chk  ef1f147a91ff2cd4aeeeae41c16068c39131096e
 
-file kleopatra-20090622-2-bin.zip
-chk  9d458d9944d24a9aa939cea090cbbeb8c7fb22a0 
+file kleopatra-20090803-bin.zip
+chk  50fcba7b99816f83aea476f6bb162781245c11bc
 
-file kleopatra-20090622-2-src.zip
-chk  b24b41a33e33957e9a2cd3646602f441906d0686
+file kleopatra-20090803-src.zip
+chk  96ab6fef6f0898e8ffce2ecfce1aaca37bcf40d5
index bf50e85..4b7561c 100644 (file)
@@ -75,6 +75,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/apps/libkleopatra/pics/key_bad.png
   File ${prefix}/share/apps/libkleopatra/pics/key_ok.png
   File ${prefix}/share/apps/libkleopatra/pics/key_unknown.png
+  File ${prefix}/share/apps/libkleopatra/pics/smartcard.xpm
 
   SetOutPath "$INSTDIR\share\config"
 
@@ -120,78 +121,80 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
   File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
 
-# FIXME these are not packaged yet  
-#  SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
-#
-#  File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-dn-order.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/favicon.ico
-#  File ${prefix}/share/doc/HTML/en/kleopatra/fdl-notice.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/functions-keylist-management.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/header.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/index.cache
-#  File ${prefix}/share/doc/HTML/en/kleopatra/index.cache.bz2
-#  File ${prefix}/share/doc/HTML/en/kleopatra/index.docbook
-#  File ${prefix}/share/doc/HTML/en/kleopatra/index.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/mainfooter.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/mainheader.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/menucrls.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/xml.dcl
-#
-#  SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra\common"
-#
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/1.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/10.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/2.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/3.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/4.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/5.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/6.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/7.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/8.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/9.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/artistic-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_bottom.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_mid.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_top.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-left.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-middle.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-right.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/bsd-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/doxygen.css
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/footer.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/kde-default.css
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/kde_logo_bg.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/qpl-license.html
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/tabs.css
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-kde.jpg
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.jpg
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-middle.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.jpg
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.png
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/top.jpg
-#  File ${prefix}/share/doc/HTML/en/kleopatra/common/x11-license.html
+  SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
+
+  File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-dn-order.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/functions-keybox-management.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/index.docbook
+  File ${prefix}/share/doc/HTML/en/kleopatra/index.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menuview.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/menuwindow.html
+
+  SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra\common"
+
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/1.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/10.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/2.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/3.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/4.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/5.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/6.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/7.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/8.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/9.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/artistic-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_bottom.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_mid.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_top.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-left.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-middle.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-right.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/bsd-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/doxygen.css
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/favicon.ico
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-notice.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/flat.css
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/footer.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/header.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/kde-default.css
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/kde.css
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/kde_logo.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/kde_logo_bg.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/mainfooter.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/mainheader.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/print.css
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/qpl-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/tabs.css
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-kde.jpg
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.jpg
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-middle.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.jpg
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.png
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/top.jpg
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/x11-license.html
+  File ${prefix}/share/doc/HTML/en/kleopatra/common/xml.dcl
 
 !endif
 ${MementoSectionEnd}
index 123d24e..9cc1402 100644 (file)
@@ -53,44 +53,54 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\libkleopatraclientcore.dll"
   Delete "$INSTDIR\libkleopatraclientgui.dll"
 
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\1.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\10.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\2.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\3.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\4.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\5.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\6.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\7.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\8.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\9.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\artistic-license.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_bottom.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_mid.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_top.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-left.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-middle.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-right.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bsd-license.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\doxygen.css"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\footer.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde-default.css"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde_logo_bg.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\qpl-license.html"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\tabs.css"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-kde.jpg"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.jpg"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-middle.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.jpg"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.png"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top.jpg"
-#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\x11-license.html"
+
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\1.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\10.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\2.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\3.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\4.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\5.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\6.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\7.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\8.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\9.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\artistic-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_bottom.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_mid.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_top.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-left.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-middle.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-right.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bsd-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\doxygen.css"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\favicon.ico"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\flat.css"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\footer.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\header.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde-default.css"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde.css"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde_logo.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde_logo_bg.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\mainfooter.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\mainheader.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\print.css"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\qpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\tabs.css"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-kde.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-middle.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.png"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\x11-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\xml.dcl"
 
   RMDir "$INSTDIR\share\doc\HTML\en\kleopatra\common"
 
@@ -101,27 +111,19 @@ Section "-un.kleopatra"
   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\favicon.ico"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\fdl-notice.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-keylist-management.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\header.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.cache"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.cache.bz2"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.docbook"
   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\mainfooter.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\mainheader.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\menucrls.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\xml.dcl"
+  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
 
   RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
   RMDir "$INSTDIR\share\doc\HTML\en"
@@ -141,6 +143,8 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_bad.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key.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"