Fix setup.py, update debian/control

This commit is contained in:
Sean Davis 2013-07-17 11:32:43 -04:00
parent deb3b024eb
commit c885fa554b
4 changed files with 22 additions and 7 deletions

View File

@ -1,3 +1,4 @@
project = mugshot project = mugshot
version = 12.08.1 version = 12.08.1
template = ubuntu-application template = ubuntu-application
dependencies =

15
debian/control vendored
View File

@ -4,8 +4,8 @@ Priority: extra
Build-Depends: debhelper (>= 8), Build-Depends: debhelper (>= 8),
python (>= 2.6.6-3~), python (>= 2.6.6-3~),
python-distutils-extra (>= 2.10) python-distutils-extra (>= 2.10)
Maintainer: UNKNOWN <UNKNOWN> Maintainer: Sean Davis <smd.seandavis@gmail.com>
Standards-Version: 3.9.3 Standards-Version: 3.9.4
X-Python-Version: >= 2.6 X-Python-Version: >= 2.6
Package: mugshot Package: mugshot
@ -21,5 +21,12 @@ Depends: ${misc:Depends},
gir1.2-gdkpixbuf-2.0, gir1.2-gdkpixbuf-2.0,
gir1.2-gst-plugins-base-1.0, gir1.2-gst-plugins-base-1.0,
yelp yelp
Description: UNKNOWN Suggests:
UNKNOWN gstreamer1.0-plugins-good
Description: a lightweight user-configuration application
Mugshot allows you to easily update personal user details. This includes:
.
Linux profile image: ~/.face
User details stored in /etc/passwd (used by finger)
Pidgin buddy icon
LibreOffice user details

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-16 06:44-0400\n" "POT-Creation-Date: 2013-07-17 11:31-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

View File

@ -71,8 +71,12 @@ def move_desktop_file(root, target_data, prefix):
# This is an /opt install, so rename desktop file to use extras- # This is an /opt install, so rename desktop file to use extras-
desktop_file = desktop_path + '/extras-mugshot.desktop' desktop_file = desktop_path + '/extras-mugshot.desktop'
try: try:
os.makedirs(desktop_path) if not os.path.exists(desktop_path):
os.rename(old_desktop_file, desktop_file) os.makedirs(desktop_path)
if old_desktop_file != desktop_file:
os.rename(old_desktop_file, desktop_file)
for filename in os.listdir(old_desktop_path):
os.remove( os.path.join(old_desktop_path, filename) )
os.rmdir(old_desktop_path) os.rmdir(old_desktop_path)
except OSError as e: except OSError as e:
print ("ERROR: Can't rename", old_desktop_file, ":", e) print ("ERROR: Can't rename", old_desktop_file, ":", e)
@ -116,6 +120,9 @@ def compile_schemas(root, target_data):
class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
def run(self): def run(self):
DistUtilsExtra.auto.install_auto.run(self) DistUtilsExtra.auto.install_auto.run(self)
if not self.root:
self.root = ''
target_data = '/' + os.path.relpath(self.install_data, self.root) + '/' target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
target_pkgdata = target_data + 'share/mugshot/' target_pkgdata = target_data + 'share/mugshot/'