From 2a83d557d1513a6900505140999f9b449835160c Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 18 Apr 2014 17:47:47 +0200
Subject: [PATCH] Order Makefile a bit more and bump release number

---
 Makefile            | 20 +++++++++++---------
 bower.json          |  2 +-
 docs/source/conf.py |  4 ++--
 package.json        |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index ff8ba5e41..a969d036a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,12 @@
 # You can set these variables from the command line.
-SPHINXOPTS   =
-SPHINXBUILD  = sphinx-build
-PAPER        =
-BUILDDIR     = ./docs
-
 BOWER 		?= node_modules/.bin/bower
+BUILDDIR     = ./docs
+PAPER        =
 PHANTOMJS	?= node_modules/.bin/phantomjs
+SPHINXBUILD  = sphinx-build
+SPHINXOPTS   =
 
 # Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
@@ -31,7 +28,10 @@ help:
 	@echo "  epub       to export the documentation to epub"
 	@echo "  changes    to make an overview of all changed/added/deprecated items added to the documentation"
 
-pot: 
+########################################################################
+## Translation machinery
+
+pot:
 	xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.7.0 -c --language="python";
 
 po:
@@ -42,6 +42,9 @@ merge: po
 po2json:
 	find ./locale -maxdepth 1 -mindepth 1 -type d -exec po2json {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
 
+########################################################################
+## Release management
+
 release:
 	sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ bower.json
 	sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.json
@@ -52,7 +55,6 @@ release:
 	sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" docs/CHANGES.rst
 	grunt minify
 
-
 ########################################################################
 ## Install dependencies
 
diff --git a/bower.json b/bower.json
index caf5ee2e6..8733dddbd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "converse",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
     "otr": "0.2.7",
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9e043a578..6959f9482 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.4'
+version = '0.8.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.4'
+release = '0.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/package.json b/package.json
index cb7423452..a57768037 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "description": "Browser based XMPP instant messaging client",
   "main": "main.js",
   "directories": {