~ubuntu-branches/ubuntu/vivid/vino/vivid-proposed

« back to all changes in this revision

Viewing changes to .pc/12_app-indicators-only.patch/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-11-18 15:53:41 UTC
  • mfrom: (1.4.8)
  • Revision ID: package-import@ubuntu.com-20131118155341-u7aet62hkfzomvi6
Tags: 3.8.1-0ubuntu1
* New upstream version, drop changes included in the new version
* debian/patches/revert_use_prompt_notification.patch:
  - revert upstream change to use a notification with actions to accept or
    deny clients, since notify-osd doesn't support those, we keep using
    the old standalone dialog instead
* debian/patches/git_tls_read.patch:
  - "Fix reading of TLS data to account for cached data"

Show diffs side-by-side

added added

removed removed

Lines of Context:
264
264
uidir = $(pkgdatadir)
265
265
dist_ui_DATA = \
266
266
        capplet/vino-preferences.ui \
267
 
        capplet/webservices \
268
 
        server/vino-prompt.ui
 
267
        capplet/webservices
269
268
 
270
269
autostartdir = $(sysconfdir)/xdg/autostart
271
270
autostart_in_files = server/vino-server.desktop.in