From 943a9ded00660668100d2f7c7cdba3fddb9694ea Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sat, 26 Nov 2016 17:47:09 +0000
Subject: [PATCH] Rename version.py to calc_version.py to fix buildd error

 - There is a version.py included with buildd that is conflicting
   with the deluge one. Rather than messing with sys.path it is
   simplest to rename version.py to calc_version.py
---
 MANIFEST.in                   | 2 +-
 version.py => calc_version.py | 0
 generate_pot.py               | 2 +-
 setup.py                      | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename version.py => calc_version.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index ff277eb36..0cb14c0fc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include AUTHORS ChangeLog DEPENDS LICENSE  msgfmt.py RELEASE-VERSION version.py README.rst
+include AUTHORS ChangeLog DEPENDS LICENSE  msgfmt.py RELEASE-VERSION calc_version.py README.rst
 
 graft docs/man
 
diff --git a/version.py b/calc_version.py
similarity index 100%
rename from version.py
rename to calc_version.py
diff --git a/generate_pot.py b/generate_pot.py
index 0a871e1e1..c7e3d2b49 100755
--- a/generate_pot.py
+++ b/generate_pot.py
@@ -19,7 +19,7 @@ from datetime import datetime
 from subprocess import call
 
 from gen_web_gettext import create_gettext_js
-from version import get_version
+from calc_version import get_version
 
 # Paths to exclude
 EXCLUSIONS = [
diff --git a/setup.py b/setup.py
index 4ba76264f..f238d2144 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ from setuptools import find_packages, setup
 from setuptools.command.test import test as _test
 
 import msgfmt
-from version import get_version
+from calc_version import get_version
 
 try:
     from sphinx.setup_command import BuildDoc