Merge pull request #746 from samj1912/revert_pypi

Revert pypi_dev related changes

picard/__init__.py

@@ -21,12 +21,9 @@ import re
 
 
 PICARD_ORG_NAME = "MusicBrainz"
+PICARD_APP_NAME = "Picard"
 PICARD_VERSION = (2, 0, 0, 'dev', 1)
 
-if PICARD_VERSION[3] == 'dev':
-    PICARD_APP_NAME = "Picard Dev"
-else:
-    PICARD_APP_NAME = "Picard"
 
 # optional build version
 # it should be in the form '<platform>_<YYMMDDHHMMSS>'

setup.py

@@ -35,13 +35,7 @@ from distutils.spawn import find_executable
 from setuptools import setup, Command, Extension
 
 
-from picard import PICARD_VERSION
-
-# Decides package name on the basis of version
-if PICARD_VERSION[3] == 'dev':
-	PACKAGE_NAME = "picard_dev"
-else:
-	PACKAGE_NAME = "picard"
+PACKAGE_NAME = "picard"
 
 ext_modules = [
     Extension('picard.util._astrcmp', sources=['picard/util/_astrcmp.c']),