License is now AGPLv3, dropping Apache.

Details: https://www.mailpile.is/blog/2015-07-02_Licensing_Decision.html

COPYING.md

@@ -1,35 +1,32 @@
 # Mailpile - a program for doing stuff with e-mail
 
-Copyright (C) 2011-2014, Bjarni R. Einarsson, Mailpile ehf and friends.
+Copyright (C) 2011-2015, Bjarni R. Einarsson, Mailpile ehf and friends.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of either:
-
-   1. the GNU Affero General Public License as published by the Free
-      Software Foundation, either version 3 of the License, or (at
-      your option) any later version.
-   2. the Apache License as published by the Apache Software Foundation,
-      either version 2.0 of the License, or (at your option) any later
-      version.
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-General Public License or the Apache License for more details.
+General Public License more details.
 
 You should have received a copy of the GNU Affero General Public License
-and the Apache License along with this program. If not, see
-<http://www.gnu.org/licenses/> and <http://www.apache.org/licenses/>.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 
+## What happened to the Apache license?
 
-## Note to contributors ##
+This software used to be dual-licensed under AGPLv3 and the Apache
+License 2.0. If you feel an uncontrollable urge to fork and carry on
+without the AGPL, the last dual-licensed code point is tagged as
+"Gunsmoke--TheLastApacheTag".  Have fun!
 
-This software will not be dual-licensed indefinitely. One of the
-licensed will be dropped before the end of 2014, although at this time
-which one has yet to be determined. This change will be made after
-discussions and consultation with the Mailpile Community.
+For more details on our licensing choices, see these blog posts:
 
-Please do not contribute code to this project unless you are in
-agreement with this plan and comfortable with your code being used under
-either or both of the licenses mentioned above.
+* <https://www.mailpile.is/blog/2015-05-08_Choosing_a_License.html>
+* <https://www.mailpile.is/blog/2015-06-15_Community_License_Feedback.html> 
+* <https://www.mailpile.is/blog/2015-07-02_Licensing_Decision.html>
 
+Thanks!

README.md

@@ -82,8 +82,6 @@ And of course, we couldn't do this without [our community of
 backers](https://www.mailpile.is/#community).
 
 This program is free software: you can redistribute it and/or modify it
-under the terms of either the GNU Affero General Public License as
-published by the Free Software Foundation or the Apache License 2.0 as
-published by the Apache Software Foundation. See the file `COPYING.md`
-for details.
+under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation. See the file `COPYING.md`for details.
 

mailpile/defaults.py

@@ -1,13 +1,12 @@
-APPVER = "0.4.4"
+APPVER = "0.4.5"
 ABOUT = """\
-Mailpile.py          a tool                 Copyright 2013-2014, Mailpile ehf
+Mailpile.py          a tool                 Copyright 2013-2015, Mailpile ehf
                for searching and                   <https://www.mailpile.is/>
            organizing piles of e-mail
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of either the GNU Affero General Public License as published by the
-Free Software Foundation or the Apache License 2.0 as published by the Apache
-Software Foundation. See the file COPYING.md for details.
+Free Software Foundation. See the file COPYING.md for details.
 """
 #############################################################################
 import os