[git] gnupg-doc - branch, master, updated. 5dedb55faddf94f16bd44480d339ca755fee4b83

[by Werner Koch]

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 "The GnuPG website and other docs".

The branch, master has been updated
       via  5dedb55faddf94f16bd44480d339ca755fee4b83 (commit)
       via  a7699e118e44b3beba9c53963b599606f20efb1e (commit)
      from  fc205344e98cb2d92d3176becdafecbdd8f9f9df (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 5dedb55faddf94f16bd44480d339ca755fee4b83
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 1 18:27:20 2016 +0100

    blog: Add an update to the last blog entry.

diff --git a/misc/blog.gnupg.org/20151224-gnupg-in-november-and-december.org b/misc/blog.gnupg.org/20151224-gnupg-in-november-and-december.org
index d13d689..e2fcd68 100644
--- a/misc/blog.gnupg.org/20151224-gnupg-in-november-and-december.org
+++ b/misc/blog.gnupg.org/20151224-gnupg-in-november-and-december.org
@@ -151,6 +151,13 @@ support for 2016 and have donated another USD60,000.  Thanks!
 Unfortunately, [[https://twitter.com/stripe/status/563449352635432960][although Facebook initially announced that they would
 provide USD50,000 of support per year]], they have since rescinded.
 
+** Update 2016-01-01
+
+We have meanwhile received unofficial information that Facebook did
+not rescinded their support pledge.  We are waiting for an official
+comment and will report on that then.
+
+
 ** About this news posting
 
 We try to write a news posting each month.  However, other work may

commit a7699e118e44b3beba9c53963b599606f20efb1e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 1 18:18:47 2016 +0100

    web: Add donation list for 2016

diff --git a/web/donate/kudos-2016.org b/web/donate/kudos-2016.org
new file mode 100644
index 0000000..81ec977
--- /dev/null
+++ b/web/donate/kudos-2016.org
@@ -0,0 +1,13 @@
+#+TITLE: GnuPG - List of Donors - 2016
+#+STARTUP: showall
+#+SETUPFILE: "../share/setup.inc"
+
+* People who donated money to GnuPG in 2016
+
+#+HTML: <ul>
+#+HTML: <!--BEGIN-DONATIONS-->
+#+HTML: <li>[please reload in a few minutes while the list is being updated]
+#+HTML: <!--END-DONATIONS-->
+#+HTML: </ul>
+
+  Thank you.
diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index 808fb41..8fc5a63 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -16,15 +16,16 @@
 
 *** Previous years
 
-| Year |   # |  \EUR | net \EUR |
-| <l>  | <r> |   <r> |      <r> |
-|------+-----+-------+----------|
-| 2014 | 801 | 34700 |          |
-| 2013 | 148 |  5041 |     4145 |
-| 2012 |  53 |  5991 |     4963 |
-| 2011 |  21 |   553 |      465 |
-|------+-----+-------+----------|
-|      |     | 46285 |          |
+| Year |    # |   \EUR | net \EUR |
+| <l>  |  <r> |    <r> |      <r> |
+|------+------+--------+----------|
+| 2015 | 5844 | 205560 |          |
+| 2014 |  801 |  34700 |    30305 |
+| 2013 |  148 |   5041 |     4145 |
+| 2012 |   53 |   5991 |     4963 |
+| 2011 |   21 |    553 |      465 |
+|------+------+--------+----------|
+|      |      | 251845 |          |
 #+TBLFM: $LR3=vsum(@I.. at II)::$LR4=vsum(@I.. at II)
 #+HTML: <div id="smallnote">
 The "net" column gives the actual value without VAT and credit card
@@ -33,7 +34,14 @@ fees.\\
 
 The [[https://gnupg.org/blog/20140512-rewards-sent.html][Goteo crowdfunding]] campaign raised an additional
 32641\thinsp\euro (27429 net) in December 2013.
+# Goteo transferred that money in March 2014 in 6 chunks:
+# 11423, 6000, 5000, 5000, 5218 = 32641
 
+# Some of the 801 donations from 2014 have been hold back by Stripe
+# over the end of the year and thus VAT was only payable in 2015.
+# That VAT is not included in the net amount for 2014.  The net amount
+# received from individual donations in 2014 have been 2525, 919, 541,
+# 26320 Euro per quarter.
 
 * List of Donors
 
@@ -46,6 +54,7 @@ The [[https://gnupg.org/blog/20140512-rewards-sent.html][Goteo crowdfunding]] ca
 
   Thank you.
 
+  - All donors to GnuPG in [[file:kudos-2016.org][2016]]
   - All donors to GnuPG in [[file:kudos-2015.org][2015]]
   - All donors to GnuPG in [[file:kudos-2014.org][2014]]
   - All donors to GnuPG in [[file:kudos-2013.org][2013]]

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

Summary of changes:
 .../20151224-gnupg-in-november-and-december.org    |  7 ++++++
 web/donate/{kudos-2015.org => kudos-2016.org}      |  4 ++--
 web/donate/kudos.org                               | 27 ++++++++++++++--------
 3 files changed, 27 insertions(+), 11 deletions(-)
 copy web/donate/{kudos-2015.org => kudos-2016.org} (73%)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org