~ubuntu-branches/ubuntu/saucy/nautilus-dropbox/saucy

« back to all changes in this revision

Viewing changes to .pc/use-var-lib-dropbox.patch/dropbox.in

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2011-11-22 11:04:25 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20111122110425-ladrimzb1afydgzd
Tags: 0.7.1-1
* New upstream release.
* Do not touch /var/lib/update-notifier/dpkg-run-stamp as
  /etc/apt/apt.conf.d/99update-notifier does it for us anyway at the end of
  the APT run. Manual installations of the package will not get the
  message but that's ok.
* Drop /var/lib/update-notifier/user.d/dropbox-{re,}start-required
  on removal since we create them in the postinst and they
  might still be there if update-notifier is not installed.
  Closes: #648215
* Drop fix-path-of-desktop-file.patch, applied upstream.
* Refresh all other patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
 
57
57
PARENT_DIR = os.path.expanduser("~")
58
58
DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
 
59
DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop"
59
60
 
60
61
enc = locale.getpreferredencoding()
61
62
 
1254
1255
    # UBUNTU
1255
1256
    if u".config" in contents:
1256
1257
        autostart_dir = os.path.join(home_dir, u".config", u"autostart")
1257
 
        autostart_link = os.path.join(autostart_dir, u"%s.desktop" % "dropbox") #BUILD_KEY.lower()
1258
 
        desktop_file = u"@DESKTOP_FILE_DIR@/%s.desktop" % "dropbox" #BUILD_KEY.lower()
 
1258
        autostart_link = os.path.join(autostart_dir, u"dropbox.desktop")
1259
1259
        if should_autostart:
1260
 
            if os.path.exists(desktop_file):
 
1260
            if os.path.exists(DESKTOP_FILE):
1261
1261
                if not os.path.exists(autostart_dir):
1262
1262
                    os.makedirs(autostart_dir)
1263
 
                shutil.copyfile(desktop_file, autostart_link)
 
1263
                shutil.copyfile(DESKTOP_FILE, autostart_link)
1264
1264
        elif os.path.exists(autostart_link):
1265
1265
            os.remove(autostart_link)
1266
1266