← Back to branch summary

~ubuntu-branches/ubuntu/wily/blueman/wily

« back to all changes in this revision

Viewing changes to data/configs/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2015-09-07 12:48:18 UTC
  • mfrom: (2.3.11 sid)
  • Revision ID: package-import@ubuntu.com-20150907124818-evulc0mhjotz8q29
Tags: 2.0-1ubuntu1
https://launchpad.net/bugs/1482626
* Merge from Debian unstable (LP: #1482626). Remaining changes:
  - debian/patches/03_filemanage_fix.patch:
    + Dropped, no longer needed.
  - debian/patches/dhcpclient_priority
  - debian/patches/01_dont_autostart_lxde.patch
    + Refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/configs/Makefile.am
7
7
dbus_sessdir = $(datadir)/dbus-1/services
8
8
dbus_sess_DATA = blueman-applet.service
9
9
 
10
 
if ENABLE_HAL   
11
 
hal_fdidir = $(datadir)/hal/fdi/information/20thirdparty
12
 
hal_fdi_DATA = 11-blueman-bnep.fdi
13
 
endif
14
 
 
 
10
if HAVE_POLKIT
15
11
@INTLTOOL_POLICY_RULE@ 
16
12
policykitdir = $(datadir)/polkit-1/actions
17
13
policykit_in_files = org.blueman.policy.in
18
14
policykit_DATA = $(policykit_in_files:.policy.in=.policy)
19
 
 
 
15
endif
20
16
 
21
17
EXTRA_DIST = org.blueman.Mechanism.conf         \
22
18
        blueman-applet.service.in               \
23
19
        org.blueman.Mechanism.service.in        \
24
 
        org.blueman.policy.in                   \
25
 
        11-blueman-bnep.fdi
 
20
        org.blueman.policy.in
26
21
 
27
22
CLEANFILES =            \
28
23
        org.blueman.Mechanism.service   \