forked from openlp/openlp
Fix setup.py
This commit is contained in:
parent
567b3f4b57
commit
7d2f8fa6cd
@ -1 +1 @@
|
||||
2.1.0-bzr2234
|
||||
2.1.0-bzr2389
|
||||
|
@ -149,9 +149,9 @@ def get_application_version():
|
||||
# If they are equal, then this tree is tarball with the source for the release. We do not want the revision
|
||||
# number in the full version.
|
||||
if tree_revision == tag_revision:
|
||||
full_version = tag_version
|
||||
full_version = tag_version.decode('utf-8')
|
||||
else:
|
||||
full_version = '%s-bzr%s' % (tag_version, tree_revision)
|
||||
full_version = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8'))
|
||||
else:
|
||||
# We're not running the development version, let's use the file.
|
||||
filepath = AppLocation.get_directory(AppLocation.VersionDir)
|
||||
|
@ -1,7 +1,5 @@
|
||||
[Desktop Entry]
|
||||
Categories=AudioVideo;
|
||||
Comment[de]=
|
||||
Comment=
|
||||
Exec=openlp %F
|
||||
GenericName[de]=Church lyrics projection
|
||||
GenericName=Church lyrics projection
|
||||
@ -9,11 +7,7 @@ Icon=openlp
|
||||
MimeType=application/x-openlp-service;
|
||||
Name[de]=OpenLP
|
||||
Name=OpenLP
|
||||
Path=
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
Type=Application
|
||||
X-DBUS-ServiceName=
|
||||
X-DBUS-StartupType=
|
||||
X-KDE-SubstituteUID=false
|
||||
X-KDE-Username=
|
||||
|
6
setup.py
6
setup.py
@ -106,9 +106,9 @@ try:
|
||||
# If they are equal, then this tree is tarball with the source for the release. We do not want the revision number
|
||||
# in the version string.
|
||||
if tree_revision == tag_revision:
|
||||
version_string = tag_version
|
||||
version_string = tag_version.decode('utf-8')
|
||||
else:
|
||||
version_string = '%s-bzr%s' % (tag_version, tree_revision)
|
||||
version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8'))
|
||||
ver_file = open(VERSION_FILE, 'w')
|
||||
ver_file.write(version_string)
|
||||
except:
|
||||
@ -152,7 +152,7 @@ using a computer and a data projector.""",
|
||||
'Operating System :: POSIX :: BSD :: FreeBSD',
|
||||
'Operating System :: POSIX :: Linux',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Topic :: Desktop Environment :: Gnome',
|
||||
'Topic :: Desktop Environment :: K Desktop Environment (KDE)',
|
||||
'Topic :: Multimedia',
|
||||
|
Loading…
Reference in New Issue
Block a user