From cc651b18ac50683c33cc912a18aaaa08328ebbee Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Sun, 8 Jun 2014 21:58:14 +0200
Subject: [PATCH] Bump up version and upload to Pypi.

---
 Makefile          | 14 +++++++++-----
 doc/changelog.txt |  5 ++++-
 dosage.freecode   |  7 +++----
 setup.py          |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 8b116d86f..ac3e59f09 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ ARCHIVE_SOURCE:=$(LAPPNAME)-$(VERSION).tar.gz
 ARCHIVE_WIN32:=$(LAPPNAME)-$(VERSION).exe
 GITUSER:=wummel
 GITREPO:=$(LAPPNAME)
-WEBPAGE:=$(HOME)/public_html/dosage-webpage.git
+HOMEPAGE:=$(HOME)/public_html/dosage-webpage.git
 WEBMETA:=doc/web/app.yaml
 DEBUILDDIR:=$(HOME)/projects/debian/official
 DEBORIGFILE:=$(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.gz
@@ -40,10 +40,14 @@ sign:
 	[ -f dist/$(ARCHIVE_SOURCE).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_SOURCE)
 	[ -f dist/$(ARCHIVE_WIN32).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_WIN32)
 
-upload:
-	cp dist/$(ARCHIVE_SOURCE) dist/$(ARCHIVE_WIN32) \
-	  dist/$(ARCHIVE_SOURCE).asc dist/$(ARCHIVE_WIN32).asc \
-	  $(WEBPAGE)/dist
+upload:	upload_source upload_binary
+
+upload_source:
+	twine upload dist/$(ARCHIVE_SOURCE) dist/$(ARCHIVE_SOURCE).asc
+
+upload_binary:
+	cp dist/$(ARCHIVE_WIN32) dist/$(ARCHIVE_WIN32).asc \
+	  $(HOMEPAGE)/dist
 
 homepage:
 # update metadata
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 092239257..eab2c5469 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,4 +1,7 @@
-Dosage 2.14 (released xx.xx.2014)
+Dosage 2.14 (released 8.6.2014)
+
+Changes:
+- installation: Source releases are now available from PyPi.
 
 Fixes:
 - comics: Fixed LoadingArtist, PennyArcade, ZenPencils.
diff --git a/dosage.freecode b/dosage.freecode
index 8856ee551..e42ac9e09 100644
--- a/dosage.freecode
+++ b/dosage.freecode
@@ -1,11 +1,10 @@
 Project: dosage
-Version: 2.13
+Version: 2.14
 Hide: N
 Website-URL: http://wummel.github.io/dosage/
 Changelog-URL: https://github.com/wummel/dosage/blob/master/doc/changelog.txt
-Source-Package-URL: http://wummel.github.io/dosage/dist/dosage-${version}.tar.gz
+Source-Package-URL: https://pypi.python.org/packages/source/d/dosage/dosage-${version}.tar.gz
 GIT-Tree-URL: https://github.com/wummel/dosage.git
 Windows-installer-URL: http://wummel.github.io/dosage/dist/dosage-${version}.exe
 
-Severalcomics have been added and fixed. Pressing Ctrl-C now cancels all
-download threads.
+Several comics have been fixed. Source releases are now available from PyPi.
diff --git a/setup.py b/setup.py
index 2e645eab1..ad7007c6d 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ from distutils.command.register import register
 from distutils import util
 from distutils.file_util import write_file
 
-AppVersion = '2.13'
+AppVersion = '2.14'
 AppName = 'Dosage'
 
 py_excludes = ['doctest', 'unittest', 'Tkinter', 'pdb',