Merge remote-tracking branch 'origin/master'

.gitignore

@@ -14,3 +14,5 @@ weblate-*.tar.*
 /tags
 /django
 .idea/*
+/Weblate.egg-info/
+/build/

MANIFEST.in

+include COPYING
+include ChangeLog
+include README.rst
+recursive-include weblate/accounts *.py
+recursive-include weblate/lang *.py
+recursive-include weblate/trans *.py
+include weblate/*.py
+recursive-include weblate/ttf *
+recursive-include weblate/media *
+recursive-include weblate/html *.html
+recursive-include docs *.rst
+recursive-include examples *
+recursive-include locale *.po

README.md → README.rst

-# Weblate 
+Weblate
+=======
 
-[![Build Status](https://travis-ci.org/nijel/weblate.svg)](https://travis-ci.org/nijel/weblate)
-[![Coverage Status](https://img.shields.io/coveralls/nijel/weblate.svg)](https://coveralls.io/r/nijel/weblate?branch=master)
-[![Translation status](http://l10n.cihar.com/widgets/weblate-shields-badge.svg)](https://l10n.cihar.com/engage/weblate/?utm_source=widget)
-[![Code Health](https://landscape.io/github/nijel/weblate/master/landscape.png)](https://landscape.io/github/nijel/weblate/master)
+.. image:: https://travis-ci.org/nijel/weblate.svg
+    :alt: Build status
+    :target: https://travis-ci.org/nijel/weblate
 
-[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=253393)](https://www.bountysource.com/trackers/253393-weblate?utm_source=253393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
-[![tip for next commit](http://tip4commit.com/projects/497.svg)](http://tip4commit.com/projects/497)
+.. image:: http://l10n.cihar.com/widgets/weblate-shields-badge.svg
+    :alt: Translation status
+    :target: https://l10n.cihar.com/engage/weblate/?utm_source=widget
+
+.. image:: https://img.shields.io/coveralls/nijel/weblate.svg
+    :alt: Coverage Status
+    :target: https://coveralls.io/r/nijel/weblate?branch=master
+
+.. image:: https://landscape.io/github/nijel/weblate/master/landscape.png
+    :alt: Code Health
+    :target: https://landscape.io/github/nijel/weblate/master
+
+.. image:: https://www.bountysource.com/badge/tracker?tracker_id=253393
+    :alt: Bountysource
+    :target: https://www.bountysource.com/trackers/253393-weblate?utm_source=253393&utm_medium=shield&utm_campaign=TRACKER_BADGE
 
 Weblate is a free web-based translation tool with tight Git integration. It
 features simple and clean user interface, propagation of translations across
@@ -14,7 +27,8 @@ subprojects, quality checks and automatic linking to source files.
 
 Weblate has it's website at http://weblate.org/.
 
-## Features
+Features
+--------
 
 * Easy web based translation
 * Propagation of translations across sub-projects (for different branches)
@@ -26,25 +40,29 @@ Weblate has it's website at http://weblate.org/.
 * Tunable access control
 * Wide range of supported translation formats (Gettext, Qt, Java, Windows, Symbian and more)
 
-## Documentation
+Documentation
+-------------
 
-Detailed documentation is available in **docs** directory in the sources.
+Detailed documentation is available in ``docs`` directory in the sources.
 
 The documentation can be also viewed online on
 http://docs.weblate.org/.
 
-## Installation
+Installation
+------------
 
 Installation and setup instructions are provided in our manual, check
 quick setup guide:
 
 http://docs.weblate.org/en/latest/admin/quick.html
 
-## Bugs
+Bugs
+----
 
 Please report bugs to https://github.com/nijel/weblate/issues.
 
-## License
+License
+-------
 
 Copyright (C) 2012 - 2014 Michal Čihař michal@cihar.com
 

setup.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2012 - 2014 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+from setuptools import setup
+from weblate import VERSION_BASE
+
+with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
+    README = readme.read()
+
+# allow setup.py to be run from any path
+os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
+
+setup(
+    name='Weblate',
+    version=VERSION_BASE,
+    packages=[
+        'weblate',
+        'weblate.accounts',
+        'weblate.accounts.management',
+        'weblate.accounts.management.commands',
+        'weblate.lang',
+        'weblate.lang.management',
+        'weblate.lang.management.commands',
+        'weblate.trans',
+        'weblate.trans.autofixes',
+        'weblate.trans.checks',
+        'weblate.trans.models',
+        'weblate.trans.views',
+        'weblate.trans.tests',
+        'weblate.trans.machine',
+        'weblate.trans.management',
+        'weblate.trans.management.commands',
+        'weblate.trans.south_migrations',
+        'weblate.accounts.south_migrations',
+        'weblate.lang.south_migrations',
+    ],
+    package_data={
+        'weblate': [
+            'html/*.html',
+            'html/accounts/*.html',
+            'html/admin/*.html',
+            'html/admin/trans/*.html',
+            'html/js/*.html',
+            'html/js/*.js',
+            'html/mail/*.html',
+            'html/mail/*.txt',
+            'ttf/*',
+            'media/*.js',
+            'media/*.ico',
+            'media/*.txt',
+            'media/*.css',
+            'media/*.png',
+            'media/*.gif',
+            'media/widgets/*.png',
+            'media/js/*.js',
+        ],
+    },
+    license='GPLv3+',
+    description='A web-based translation tool with tight Git integration',
+    long_description=README,
+    url='http://weblate.org/',
+    download_url='https://github.com/nijel/weblate',
+    author='Michal Čihař',
+    author_email='michal@cihar.com',
+    classifiers=[
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: '
+        'GNU General Public License v3 or later (GPLv3+)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+    ],
+)
+

weblate.spec

@@ -70,7 +70,7 @@ cp -a . %{buildroot}/%{WLDIR}
 
 # We ship this separately
 rm -rf %{buildroot}/%{WLDIR}/docs
-rm -f %{buildroot}/%{WLDIR}/README.md \
+rm -f %{buildroot}/%{WLDIR}/README.rst \
     %{buildroot}/%{WLDIR}/ChangeLog \
     %{buildroot}/%{WLDIR}/COPYING \
     %{buildroot}/%{WLDIR}/INSTALL
@@ -105,7 +105,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc docs/_build/html
-%doc README.md
+%doc README.rst
 %config(noreplace) /%{_sysconfdir}/weblate
 %config(noreplace) /%{_sysconfdir}/apache2
 %{WLDIR}

weblate/__init__.py

@@ -44,6 +44,9 @@ def is_running_git():
 # Weblate version
 VERSION = '1.10'
 
+# Version string without suffix
+VERSION_BASE = VERSION
+
 # User-Agent string to use
 USER_AGENT = 'Weblate/{0}'.format(VERSION)