[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-249-gcc2314b
by Andre Heinecke
cvs at cvs.gnupg.org
Sun May 14 12:20:44 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via cc2314bdc07fee57109374a4d32b8cd5b6ac36a7 (commit)
via 0bf4253cc19461ecfa9955428e23774b6500de1e (commit)
via 45f70266cf1dfaaba27a0717fc5c32925b05fd11 (commit)
via 5d6a13b0a82e4f3e4ec4174f9cd86dc68db66e92 (commit)
via d45bd0cfcfc616dad4fd816f140b52ae915a18b8 (commit)
via 5c63b88e7432fa9461ca1873203935506ebd0182 (commit)
via f8eae16b3aa07cbaaf34455c2672efebef2a44dc (commit)
from 538ffc13c0ef5c8896306226c5dd3c758e22ad0b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cc2314bdc07fee57109374a4d32b8cd5b6ac36a7
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 12:19:41 2017 +0200
Fix Shortcut installation / removal for Multiuser
* src/inst-sections.nsi, src/uninst-sections.nsi: Set shell var
context based on elevation level.
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 1bd2a50..1a504e0 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -973,15 +973,17 @@ FunctionEnd
Section "-startmenu"
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" is_admin is_no_admin
+is_admin:
+ SetShellVarContext all
+
+is_no_admin:
+
# NOT SetOutPath.
StrCpy $OUTDIR "%HOMEDRIVE%%HOMEPATH%"
- # Make sure that the context of the automatic variables has been set to
- # the "all users" shell folder. This guarantees that the menu gets written
- # for all users. We have already checked that we are running as Admin; or
- # we printed a warning that installation will not succeed.
- SetShellVarContext all
-
# Check if the start menu entries where requested.
g4wihelp::config_fetch_bool "inst_start_menu"
StrCmp $R0 "0" no_start_menu
diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index 302292a..69808f1 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -221,11 +221,12 @@ SectionEnd
Section Uninstall
- # Make sure that the context of the automatic variables has been set to
- # the "all users" shell folder. This guarantees that the menu gets written
- # for all users. We have already checked that we are running as Admin; or
- # we printed a warning that installation will not succeed.
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" is_admin is_no_admin
+is_admin:
SetShellVarContext all
+is_no_admin:
#---------------------------------------------------
# Delete the menu entries and any empty parent menus
commit 0bf4253cc19461ecfa9955428e23774b6500de1e
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 12:17:15 2017 +0200
Add support for minimal cmd line switch
* src/gpg4win.nsi: Add new var.
* src/inst-sections.nsi: Select sections based on minimal.
* src/installer.nsi: Handle cmd line switch.
--
GnuPG-Bug-ID: T3104
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index 4f3dc43..e26863c 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -171,6 +171,9 @@ SetCompressor /SOLID lzma
!include "uninst-claws-mail.nsi"
!endif
+# Variables
+VAR is_minimal
+
# Sections
!include "Sections.nsh"
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index c8075e9..1bd2a50 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -510,6 +510,21 @@ calc_defaults_man_advanced_de_done:
calc_defaults_man_advanced_en_done:
!endif
+# Check if minimal install was requested on the command line
+
+StrCmp $is_minimal '1' select_minimal continue
+select_minimal:
+ !insertmacro UnselectSection ${SEC_kleopatra}
+ !insertmacro UnselectSection ${SEC_gpgol}
+ !insertmacro UnselectSection ${SEC_gpgex}
+ !insertmacro UnselectSection ${SEC_gpa}
+ !insertmacro UnselectSection ${SEC_compendium}
+
+# We only do pinentry and gnupg-w32
+ !insertmacro SelectSection ${SEC_paperkey}
+ !insertmacro SelectSection ${SEC_gnupg_w32}
+ !insertmacro SelectSection ${SEC_pinentry}
+continue:
FunctionEnd
diff --git a/src/installer.nsi b/src/installer.nsi
index 28eccc2..040d3ff 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -671,6 +671,10 @@ Function .onInit
Delete $TEMP\gpgspltmp.bmp
# Note that we delete gpgspltmp.wav in .onInst{Failed,Success}
!endif
+ ${GetParameters} $R0
+ ClearErrors
+ ${GetOptions} $R0 /MINIMAL= $is_minimal
+
Var /GLOBAL changed_dir
# Check if the install directory was modified on the command line
StrCmp "$INSTDIR" "$PROGRAMFILES\${INSTALL_DIR}" unmodified 0
commit 45f70266cf1dfaaba27a0717fc5c32925b05fd11
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 12:15:01 2017 +0200
Add deprecation warning for Windows XP
* src/installer.nsi: Add deprecation warning for Windows XP.
--
We no longer test there as a first Tier platform and may want
to remove support in the future.
GnuPG-Bug-Id: T3153
diff --git a/src/installer.nsi b/src/installer.nsi
index c64ccf6..28eccc2 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -31,6 +31,7 @@
!endif
!include "WinMessages.nsh"
+!include "WinVer.nsh"
# We use the modern UI 2.
!include "MUI2.nsh"
@@ -545,6 +546,11 @@ LangString T_FoundOldClaws ${LANG_ENGLISH} \
http://www.claws-mail.org/win32 $\r$\n$\r$\n\
Uninstall Claws Mail from Gpg4win now?"
+# From Function CheckClawsUninstall
+LangString T_XPisDeprecated ${LANG_ENGLISH} \
+ "Windows Versions before Windows Vista are no longer maintained by Gpg4win. \
+ $\r$\nSupport for them may be removed in a future version."
+
# FIXME: The GetAfterChar function comes from the NSIS wiki.
Function un.GetAfterChar
Exch $0 ; chop char
@@ -687,6 +693,10 @@ initDone:
!endif
!insertmacro MUI_LANGDLL_DISPLAY
+${IfNot} ${AtLeastWinVista}
+ MessageBox MB_OK "$(T_XPisDeprecated)"
+${Endif}
+
${MementoSectionRestore}
Call CalcDefaults
Call CalcDepends
commit 5d6a13b0a82e4f3e4ec4174f9cd86dc68db66e92
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 12:12:19 2017 +0200
Fix qtbase dependency calculation
* src/inst-sections.nsi (CALC_DEPENDS): Move qtbase calculation
below any calculation selecting qtbase.
--
This fixes libpng / zlib selection if pinentry-qt is installed
but not kleopatra.
GnuPG-Bug-Id: T3104
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 00864a8..c8075e9 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -769,15 +769,6 @@ Function CalcDepends
skip_kleopatra_libs:
!endif
-!ifdef HAVE_PKG_QTBASE
- !insertmacro SectionFlagIsSet ${SEC_qtbase} \
- ${SF_SELECTED} have_qt skip_qt
- have_qt:
- !insertmacro SelectSection ${SEC_libpng}
- !insertmacro SelectSection ${SEC_zlib}
- skip_qt:
-!endif
-
!ifdef HAVE_PKG_GPGME
!insertmacro SectionFlagIsSet ${SEC_gpgme} \
${SF_SELECTED} have_gpgme skip_gpgme
@@ -806,6 +797,15 @@ Function CalcDepends
skip_pinentry:
!endif
+!ifdef HAVE_PKG_QTBASE
+ !insertmacro SectionFlagIsSet ${SEC_qtbase} \
+ ${SF_SELECTED} have_qt skip_qt
+ have_qt:
+ !insertmacro SelectSection ${SEC_libpng}
+ !insertmacro SelectSection ${SEC_zlib}
+ skip_qt:
+!endif
+
!ifdef HAVE_PKG_LIBASSUAN
!insertmacro SectionFlagIsSet ${SEC_libassuan} ${SF_SELECTED} have_libassuan skip_libassuan
have_libassuan:
commit d45bd0cfcfc616dad4fd816f140b52ae915a18b8
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 12:11:17 2017 +0200
No longer install breeze-dark
* src/inst-breeze-icons.nsi,
src/uninst-breeze-icons.nsi: Remove breeze-dark.
--
This was more of an experiement which theme looks better one
theme for kleopatra is enough.
diff --git a/src/inst-breeze-icons.nsi b/src/inst-breeze-icons.nsi
index a5afd4c..c8b4f54 100644
--- a/src/inst-breeze-icons.nsi
+++ b/src/inst-breeze-icons.nsi
@@ -37,255 +37,6 @@ Section "-breeze-icons" SEC_breeze_icons
# Note: You may want to use the pkg-to-nsi.pl script to create the
# list of icons.
#
- SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\16"
-
- File ${prefix}/share/icons/breeze-dark/actions/16/application-exit.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/arrow-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/arrow-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/configure-shortcuts.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/configure-toolbars.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/dialog-cancel.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/dialog-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/dialog-ok-apply.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/dialog-ok.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-decrypt-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-decrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-sign-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-sign.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-open.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-print.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/document-revert.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/draw-arrow-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/draw-arrow-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-clear-locationbar-rtl.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-delete.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-find.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-paste.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-redo.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-rename.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/edit-undo.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-bottom.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-first.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-last.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-next.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-previous.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-top.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/go-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/help-contents.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/help-contextual.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/list-add.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/list-remove.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/process-stop.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/run-build-configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/settings-configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/tab-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/tab-duplicate.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/tab-new-background.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/tools-report-bug.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/view-refresh.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/window-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/visibility.svg
- File ${prefix}/share/icons/breeze-dark/actions/16/hint.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\22"
-
- File ${prefix}/share/icons/breeze-dark/actions/22/application-exit.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/arrow-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/arrow-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/configure-shortcuts.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/configure-toolbars.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/dialog-cancel.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/dialog-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/dialog-ok-apply.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/dialog-ok.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-decrypt-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-decrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-sign-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-sign.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-open.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-print.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/document-revert.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/draw-arrow-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/draw-arrow-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-clear-locationbar-rtl.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-delete.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-find.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-paste.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-redo.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-rename.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/edit-undo.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-bottom.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-first.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-last.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-next.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-previous.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-top.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/go-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/help-contents.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/help-contextual.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/list-add.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/list-remove.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/process-stop.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/run-build-configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/settings-configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/tab-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/tab-duplicate.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/tab-new-background.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/tools-report-bug.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-add.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-export-secret.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-export-server.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-export.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-import.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-server-configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-sign.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/view-refresh.svg
- File ${prefix}/share/icons/breeze-dark/actions/22/window-close.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\24"
-
- File ${prefix}/share/icons/breeze-dark/actions/24/application-exit.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/arrow-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/arrow-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/configure-toolbars.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/dialog-cancel.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/dialog-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/dialog-ok-apply.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/dialog-ok.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-decrypt-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-decrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-sign-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-sign.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-open.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-print.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/document-revert.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/draw-arrow-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/draw-arrow-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-clear-locationbar-rtl.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-delete.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-find.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-paste.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-redo.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-rename.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/edit-undo.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-bottom.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-down.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-first.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-last.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-next.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-previous.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-top.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/go-up.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/gtk-tab-duplicate.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/help-contextual.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/list-add.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/list-remove.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/process-stop.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/run-build-configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/tab-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/tab-duplicate.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/tab-new-background.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/tools-report-bug.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/view-refresh.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/window-close.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/visibility.svg
- File ${prefix}/share/icons/breeze-dark/actions/24/hint.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\32"
-
- File ${prefix}/share/icons/breeze-dark/actions/32/application-exit.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/configure.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/dialog-cancel.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/dialog-ok-apply.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-decrypt-verify.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-decrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-sign-encrypt.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-sign.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-open.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-print.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/document-revert.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/edit-delete.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/edit-redo.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/edit-undo.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/view-refresh.svg
- File ${prefix}/share/icons/breeze-dark/actions/32/window-close.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\apps\22"
-
- File ${prefix}/share/icons/breeze-dark/apps/22/kde.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\apps\32"
-
- File ${prefix}/share/icons/breeze-dark/apps/32/preferences-desktop-locale.svg
- File ${prefix}/share/icons/breeze-dark/apps/32/preferences-system-network.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\apps\48"
-
- File ${prefix}/share/icons/breeze-dark/apps/48/internet-mail.svg
- File ${prefix}/share/icons/breeze-dark/apps/48/telepathy-kde.svg
- File ${prefix}/share/icons/breeze-dark/apps/48/usb-creator-kde.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\categories\32"
-
- File ${prefix}/share/icons/breeze-dark/categories/32/applications-graphics.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark"
-
- File ${prefix}/share/icons/breeze-dark/index.theme
- File ${prefix}/share/icons/breeze-dark/icon-theme.cache
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\places\16"
-
- File ${prefix}/share/icons/breeze-dark/places/16/start-here-kde.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\places\22"
-
- File ${prefix}/share/icons/breeze-dark/places/22/start-here-kde.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\places\64"
-
- File ${prefix}/share/icons/breeze-dark/places/64/start-here-kde.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\status\16"
-
- File ${prefix}/share/icons/breeze-dark/status/16/dialog-information.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\status\22"
-
- File ${prefix}/share/icons/breeze-dark/status/22/dialog-information.svg
- File ${prefix}/share/icons/breeze-dark/status/22/security-high.svg
- File ${prefix}/share/icons/breeze-dark/status/22/security-low.svg
- File ${prefix}/share/icons/breeze-dark/status/22/security-medium.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\status\24"
-
- File ${prefix}/share/icons/breeze-dark/status/24/dialog-information.svg
-
- SetOutPath "$INSTDIR\share\icons\breeze-dark\status\64"
-
- File ${prefix}/share/icons/breeze-dark/status/64/dialog-error.svg
- File ${prefix}/share/icons/breeze-dark/status/64/dialog-information.svg
- File ${prefix}/share/icons/breeze-dark/status/64/dialog-password.svg
- File ${prefix}/share/icons/breeze-dark/status/64/dialog-warning.svg
- File ${prefix}/share/icons/breeze-dark/status/64/security-high.svg
- File ${prefix}/share/icons/breeze-dark/status/64/security-low.svg
- File ${prefix}/share/icons/breeze-dark/status/64/security-medium.svg
-
SetOutPath "$INSTDIR\share\icons\breeze\actions\16"
File ${prefix}/share/icons/breeze/actions/16/application-exit.svg
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
index 6d68c75..83af399 100644
--- a/src/uninst-breeze-icons.nsi
+++ b/src/uninst-breeze-icons.nsi
@@ -243,210 +243,6 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-success.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-error.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-question.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-medium.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-low.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-high.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-warning.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-password.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-information.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-error.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\24\dialog-information.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\22\security-medium.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\22\security-low.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\22\security-high.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\22\dialog-information.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\status\16\dialog-information.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\places\64\start-here-kde.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\places\22\start-here-kde.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\places\16\start-here-kde.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\index.theme"
- Delete "$INSTDIR\share\icons\breeze-dark\icon-theme.cache"
- Delete "$INSTDIR\share\icons\breeze-dark\categories\32\applications-graphics.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\apps\48\usb-creator-kde.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\apps\48\telepathy-kde.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\apps\48\internet-mail.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\apps\32\preferences-system-network.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\apps\32\preferences-desktop-locale.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\apps\22\kde.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\window-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\view-refresh.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\edit-undo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\edit-redo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\edit-delete.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-revert.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-print.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-open.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-sign-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-decrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-decrypt-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\dialog-ok-apply.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\dialog-cancel.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\32\application-exit.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\window-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\view-refresh.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tools-report-bug.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tab-new-background.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tab-duplicate.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tab-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\run-build-configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\process-stop.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\list-remove.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\list-add.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\help-contextual.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\gtk-tab-duplicate.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-top.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-previous.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-next.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-last.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-first.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-bottom.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-undo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-rename.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-redo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-paste.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-find.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-delete.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-clear-locationbar-rtl.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\draw-arrow-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\draw-arrow-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-revert.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-print.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-open.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-sign-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-decrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-decrypt-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-ok.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-ok-apply.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-cancel.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\configure-toolbars.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\arrow-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\arrow-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\application-exit.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\visibility.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\24\hint.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\window-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-refresh.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-server-configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-import.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-export.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-export-server.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-export-secret.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-add.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tools-report-bug.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tab-new-background.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tab-duplicate.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tab-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\settings-configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\run-build-configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\process-stop.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\list-remove.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\list-add.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\help-contextual.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\help-contents.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-top.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-previous.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-next.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-last.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-first.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-bottom.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-undo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-rename.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-redo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-paste.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-find.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-delete.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-clear-locationbar-rtl.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\draw-arrow-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\draw-arrow-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-revert.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-print.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-open.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-sign-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-decrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-decrypt-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-ok.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-ok-apply.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-cancel.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\configure-toolbars.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\configure-shortcuts.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\arrow-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\arrow-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\22\application-exit.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\window-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\view-refresh.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tools-report-bug.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tab-new-background.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tab-duplicate.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tab-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\settings-configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\run-build-configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\process-stop.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\list-remove.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\list-add.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\help-contextual.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\help-contents.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-top.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-previous.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-next.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-last.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-first.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-bottom.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-undo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-rename.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-redo.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-paste.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-find.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-delete.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-clear-locationbar-rtl.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\draw-arrow-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\draw-arrow-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-revert.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-print.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-open.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-sign.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-sign-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-encrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-decrypt.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-decrypt-verify.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-ok.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-ok-apply.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-close.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-cancel.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\configure.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\configure-toolbars.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\configure-shortcuts.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\arrow-up.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\arrow-down.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\application-exit.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\visibility.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\16\hint.svg"
RMDir "$INSTDIR\share\icons\breeze\emblems\8"
RMDir "$INSTDIR\share\icons\breeze\emblems"
@@ -472,27 +268,6 @@ Section "-un.breeze-icons"
RMDir "$INSTDIR\share\icons\breeze\actions\16"
RMDir "$INSTDIR\share\icons\breeze\actions"
RMDir "$INSTDIR\share\icons\breeze"
- RMDir "$INSTDIR\share\icons\breeze-dark\status\64"
- RMDir "$INSTDIR\share\icons\breeze-dark\status\24"
- RMDir "$INSTDIR\share\icons\breeze-dark\status\22"
- RMDir "$INSTDIR\share\icons\breeze-dark\status\16"
- RMDir "$INSTDIR\share\icons\breeze-dark\status"
- RMDir "$INSTDIR\share\icons\breeze-dark\places\64"
- RMDir "$INSTDIR\share\icons\breeze-dark\places\22"
- RMDir "$INSTDIR\share\icons\breeze-dark\places\16"
- RMDir "$INSTDIR\share\icons\breeze-dark\places"
- RMDir "$INSTDIR\share\icons\breeze-dark\categories\32"
- RMDir "$INSTDIR\share\icons\breeze-dark\categories"
- RMDir "$INSTDIR\share\icons\breeze-dark\apps\48"
- RMDir "$INSTDIR\share\icons\breeze-dark\apps\32"
- RMDir "$INSTDIR\share\icons\breeze-dark\apps\22"
- RMDir "$INSTDIR\share\icons\breeze-dark\apps"
- RMDir "$INSTDIR\share\icons\breeze-dark\actions\32"
- RMDir "$INSTDIR\share\icons\breeze-dark\actions\24"
- RMDir "$INSTDIR\share\icons\breeze-dark\actions\22"
- RMDir "$INSTDIR\share\icons\breeze-dark\actions\16"
- RMDir "$INSTDIR\share\icons\breeze-dark\actions"
- RMDir "$INSTDIR\share\icons\breeze-dark"
RMDir "$INSTDIR\share\icons"
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
commit 5c63b88e7432fa9461ca1873203935506ebd0182
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 12:10:09 2017 +0200
Enable LZMA compression again
* src/gpg4win.nsi: Enable LZMA again.
--
The problem was caused by Multiuser including a compression
before. If we move the Compressor selection before the Multiuser
include this works again.
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index 065a924..4f3dc43 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -134,16 +134,15 @@
# The copyright license of the package. Define only one of these.
!define LICENSE_GPL
-# !define LICENSE_LGPL
-
-# Define this if we require an NSIS running on Windows. This is
-# necessary if you want to handle DLLs properly.
-# !define REQUIRE_W32_NSIS
-
-# Most of the included software has implicit requirements for at least
-# NT4 if not even higher. To be sure require at least Windows XP.
-# TargetMinimalOS 5.1
+# Select the best compression algorithm available. The dictionary
+# size is the default (8 MB).
+!ifndef DISABLE_LZMA
+!ifndef SOURCES
+SetCompressor /SOLID lzma
+# SetCompressorDictSize 8
+!endif
+!endif
# We support user mode installation but prefer system wide
!define MULTIUSER_EXECUTIONLEVEL Highest
commit f8eae16b3aa07cbaaf34455c2672efebef2a44dc
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun May 14 11:52:52 2017 +0200
Fix uninstallation of send-to-symbolic icon
* src/uninst-breze-icons.nsi: It's not installed for
breeze-dark.
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
index b8e69ef..6d68c75 100644
--- a/src/uninst-breeze-icons.nsi
+++ b/src/uninst-breeze-icons.nsi
@@ -237,6 +237,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\16\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\visibility.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\hint.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\symbolic\send-to-symbolic.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-information.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-warning.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-success.svg"
@@ -446,7 +447,6 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\visibility.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\hint.svg"
- Delete "$INSTDIR\share\icons\breeze-dark\actions\symbolic\send-to-symbolic.svg"
RMDir "$INSTDIR\share\icons\breeze\emblems\8"
RMDir "$INSTDIR\share\icons\breeze\emblems"
-----------------------------------------------------------------------
Summary of changes:
src/gpg4win.nsi | 20 ++--
src/inst-breeze-icons.nsi | 249 --------------------------------------------
src/inst-sections.nsi | 47 ++++++---
src/installer-finish.nsi | 9 +-
src/installer.nsi | 14 +++
src/uninst-breeze-icons.nsi | 227 +---------------------------------------
6 files changed, 63 insertions(+), 503 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list