diff --git a/.quickly b/.quickly index 338c839..dbd4520 100644 --- a/.quickly +++ b/.quickly @@ -1,3 +1,4 @@ project = mugshot version = 12.08.1 template = ubuntu-application +dependencies = diff --git a/debian/control b/debian/control index 0b9d052..0cdb3f0 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: extra Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-distutils-extra (>= 2.10) -Maintainer: UNKNOWN -Standards-Version: 3.9.3 +Maintainer: Sean Davis +Standards-Version: 3.9.4 X-Python-Version: >= 2.6 Package: mugshot @@ -21,5 +21,12 @@ Depends: ${misc:Depends}, gir1.2-gdkpixbuf-2.0, gir1.2-gst-plugins-base-1.0, yelp -Description: UNKNOWN - UNKNOWN +Suggests: + 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 diff --git a/po/mugshot.pot b/po/mugshot.pot index 055f9e0..2464d40 100644 --- a/po/mugshot.pot +++ b/po/mugshot.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/setup.py b/setup.py index 3c1a964..ba71c1f 100644 --- a/setup.py +++ b/setup.py @@ -71,8 +71,12 @@ def move_desktop_file(root, target_data, prefix): # This is an /opt install, so rename desktop file to use extras- desktop_file = desktop_path + '/extras-mugshot.desktop' try: - os.makedirs(desktop_path) - os.rename(old_desktop_file, desktop_file) + if not os.path.exists(desktop_path): + 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) except OSError as 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): def 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_pkgdata = target_data + 'share/mugshot/'