[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.2-25-g2a53d72

by Andre Heinecke cvs at cvs.gnupg.org
Tue Nov 25 12:29:32 CET 2014


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  2a53d72b336a4885ba7f335dbc2f549562123957 (commit)
       via  31836ab46392b9a5b4f27191556f9f4f31692b95 (commit)
      from  e5f4d886423e8affc0d5118561921366d80cd2e8 (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 2a53d72b336a4885ba7f335dbc2f549562123957
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Nov 25 12:28:47 2014 +0100

    Install edit-paste icon for kleopatra
    
        * src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi: Add
        edit-paste.png.
    
    --
        The edit-paste icon is used for the clipboard menu entry in
        Kleopatra.

diff --git a/src/inst-oxygen-icons.nsi b/src/inst-oxygen-icons.nsi
index b7ba541..62319e5 100644
--- a/src/inst-oxygen-icons.nsi
+++ b/src/inst-oxygen-icons.nsi
@@ -44,6 +44,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
   File ${prefix}/share/icons/oxygen/128x128/actions/dialog-ok-apply.png
   File ${prefix}/share/icons/oxygen/128x128/actions/dialog-ok.png
   File ${prefix}/share/icons/oxygen/128x128/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/128x128/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/128x128/actions/go-bottom.png
   File ${prefix}/share/icons/oxygen/128x128/actions/go-down.png
   File ${prefix}/share/icons/oxygen/128x128/actions/go-first.png
@@ -103,6 +104,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-locationbar-rtl.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-delete.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-redo.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-rename.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-undo.png
@@ -186,6 +188,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
   File ${prefix}/share/icons/oxygen/22x22/actions/edit-clear-locationbar-rtl.png
   File ${prefix}/share/icons/oxygen/22x22/actions/edit-delete.png
   File ${prefix}/share/icons/oxygen/22x22/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/22x22/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/22x22/actions/edit-redo.png
   File ${prefix}/share/icons/oxygen/22x22/actions/edit-rename.png
   File ${prefix}/share/icons/oxygen/22x22/actions/edit-undo.png
@@ -279,6 +282,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
   File ${prefix}/share/icons/oxygen/32x32/actions/edit-clear-locationbar-rtl.png
   File ${prefix}/share/icons/oxygen/32x32/actions/edit-delete.png
   File ${prefix}/share/icons/oxygen/32x32/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/32x32/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/32x32/actions/edit-redo.png
   File ${prefix}/share/icons/oxygen/32x32/actions/edit-rename.png
   File ${prefix}/share/icons/oxygen/32x32/actions/edit-undo.png
@@ -361,6 +365,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
   File ${prefix}/share/icons/oxygen/48x48/actions/edit-clear-locationbar-rtl.png
   File ${prefix}/share/icons/oxygen/48x48/actions/edit-delete.png
   File ${prefix}/share/icons/oxygen/48x48/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/48x48/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/48x48/actions/edit-redo.png
   File ${prefix}/share/icons/oxygen/48x48/actions/edit-rename.png
   File ${prefix}/share/icons/oxygen/48x48/actions/edit-undo.png
@@ -425,6 +430,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
   File ${prefix}/share/icons/oxygen/64x64/actions/dialog-ok-apply.png
   File ${prefix}/share/icons/oxygen/64x64/actions/dialog-ok.png
   File ${prefix}/share/icons/oxygen/64x64/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/64x64/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/64x64/actions/go-bottom.png
   File ${prefix}/share/icons/oxygen/64x64/actions/go-down.png
   File ${prefix}/share/icons/oxygen/64x64/actions/go-first.png
diff --git a/src/uninst-oxygen-icons.nsi b/src/uninst-oxygen-icons.nsi
index e25821f..98b6c33 100644
--- a/src/uninst-oxygen-icons.nsi
+++ b/src/uninst-oxygen-icons.nsi
@@ -53,6 +53,7 @@ Section "-un.oxygen-icons"
   Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-down.png"
   Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-bottom.png"
   Delete "$INSTDIR\share\icons\oxygen\64x64\actions\edit-find.png"
+  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\edit-paste.png"
   Delete "$INSTDIR\share\icons\oxygen\64x64\actions\dialog-ok.png"
   Delete "$INSTDIR\share\icons\oxygen\64x64\actions\dialog-ok-apply.png"
   Delete "$INSTDIR\share\icons\oxygen\64x64\actions\configure.png"
@@ -99,6 +100,7 @@ Section "-un.oxygen-icons"
   Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-rename.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-redo.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-find.png"
+  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-paste.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-delete.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-clear-locationbar-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-revert.png"
@@ -163,6 +165,7 @@ Section "-un.oxygen-icons"
   Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-rename.png"
   Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-redo.png"
   Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-find.png"
+  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-paste.png"
   Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-delete.png"
   Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-clear-locationbar-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-revert.png"
@@ -233,6 +236,7 @@ Section "-un.oxygen-icons"
   Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-rename.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-redo.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-find.png"
+  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-paste.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-delete.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-clear-locationbar-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-revert.png"
@@ -297,6 +301,7 @@ Section "-un.oxygen-icons"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-rename.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-redo.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-paste.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-delete.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-locationbar-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-revert.png"
@@ -341,6 +346,7 @@ Section "-un.oxygen-icons"
   Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-down.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-bottom.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\actions\edit-find.png"
+  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\edit-paste.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\actions\dialog-ok.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\actions\dialog-ok-apply.png"
   Delete "$INSTDIR\share\icons\oxygen\128x128\actions\configure.png"

commit 31836ab46392b9a5b4f27191556f9f4f31692b95
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Nov 25 12:27:33 2014 +0100

    Update kleopatra to git-945878c
    
        * NEWS: Update kleopatra version.
        * packages/packages.current (kleopatra): Update.
    --
        This includes an improved bugfix for input process
        error detection.

diff --git a/NEWS b/NEWS
index d535bc5..7c5f8e1 100644
--- a/NEWS
+++ b/NEWS
@@ -47,7 +47,7 @@ Noteworthy changes in version 2.2.3 (unreleased)
 
 ~~~~~~~~~~~~~~~
 GnuPG:          2.0.26
-Kleopatra:      2.2.0-git2a58b4cb
+Kleopatra:      2.2.0-git945878c
 GPA:            0.9.6
 GpgOL:          1.2.1
 GpgEX:          1.0.1
diff --git a/packages/packages.current b/packages/packages.current
index 530dc32..918f1f5 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -513,10 +513,12 @@ chk  c48227c5f3b475c7792abc36c415479d3233468c
 #
 server http://files.kolab.org/local/gpg4win
 
-# This is kdepim/gpg4win branch
-# ac229d2213619345c7148f11a9732bb1ce2890a7
-file kleopatra-20141117-1-bin.tar.xz
-chk  2c8576d9e3987685e161df19be1d10d31b98e974
-
-file kleopatra-20141117-src.tar.xz
-chk  4b02f0d046d42175f347f0732eec904575915285
+# This is kdepim/gpg4win branch 945878c
+file kleopatra-20141125-bin.tar.xz
+chk  0ecc05b36c47265079af27a6ab3287ebf59d4116
+
+# This also includes the sources for kdelibs
+# kdewin win-iconv and kdepimlibs which
+# are part of binaries in the kleopatra bin package
+file kleopatra-20141125-src.tar.xz
+chk  2f3978aa4d477152b505a4c205fec3c09d9eb2bc

-----------------------------------------------------------------------

Summary of changes:
 NEWS                        |    2 +-
 packages/packages.current   |   16 +++++++++-------
 src/inst-oxygen-icons.nsi   |    6 ++++++
 src/uninst-oxygen-icons.nsi |    6 ++++++
 4 files changed, 22 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list