build: move policy file from "policy/" to "data/"

This commit is contained in:
Thomas Haller 2016-11-03 13:25:36 +01:00
parent e2b93beb83
commit 4be9b4a2cb
6 changed files with 9 additions and 10 deletions

7
.gitignore vendored
View file

@ -67,6 +67,8 @@ test-*.trs
/data/NetworkManager-dispatcher.service
/data/org.freedesktop.NetworkManager.service
/data/server.conf
/data/org.freedesktop.NetworkManager.policy
/data/org.freedesktop.NetworkManager.policy.in
/docs/api/version.xml
/docs/api/settings-spec.html
@ -235,9 +237,6 @@ test-*.trs
/po/quot.sed
/po/remove-potcdate.sin
/policy/org.freedesktop.NetworkManager.policy
/policy/org.freedesktop.NetworkManager.policy.in
/src/NetworkManager
/src/devices/tests/test-arping
/src/devices/tests/test-lldp
@ -283,6 +282,8 @@ test-*.trs
/callouts/org.freedesktop.nm_dispatcher.service
/callouts/tests/test-dispatcher-envp
/include/
/policy/org.freedesktop.NetworkManager.policy
/policy/org.freedesktop.NetworkManager.policy.in
/initscript/Slackware/rc.networkmanager
/initscript/*/[Nn]etwork[Mm]anager
/src/devices/wifi/tests/test-wifi-ap-utils

View file

@ -136,7 +136,7 @@ pkgconfig_DATA += NetworkManager.pc
polkit_policydir = $(datadir)/polkit-1/actions
dist_polkit_policy_in_in_files = \
policy/org.freedesktop.NetworkManager.policy.in.in
data/org.freedesktop.NetworkManager.policy.in.in
polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
@ -4052,8 +4052,6 @@ CLEANFILES += \
cscope.out \
cscope.po.out \
\
policy/*~ \
\
$(NULL)
###############################################################################

View file

@ -1151,7 +1151,7 @@ libnm-glib/libnm-glib.pc
libnm-glib/libnm-glib-vpn.pc
man/common.ent
po/Makefile.in
policy/org.freedesktop.NetworkManager.policy.in
data/org.freedesktop.NetworkManager.policy.in
docs/api/Makefile
docs/api/version.xml
docs/libnm-glib/Makefile

View file

@ -141,7 +141,7 @@ libnm/nm-remote-connection.c
libnm/nm-remote-settings.c
libnm/nm-vpn-plugin-old.c
libnm/nm-vpn-service-plugin.c
policy/org.freedesktop.NetworkManager.policy.in.in
data/org.freedesktop.NetworkManager.policy.in.in
shared/nm-utils/nm-shared-utils.c
src/NetworkManagerUtils.c
src/main.c

View file

@ -1,7 +1,7 @@
data/NetworkManager.service.in
examples/python/NetworkManager.py
examples/python/systray/eggtrayicon.c
policy/org.freedesktop.NetworkManager.policy.in
data/org.freedesktop.NetworkManager.policy.in
vpn-daemons/openvpn
vpn-daemons/pptp
vpn-daemons/vpnc
@ -9,4 +9,4 @@ contrib/fedora/rpm/
shared/nm-utils/nm-vpn-editor-plugin-call.h
shared/nm-utils/nm-vpn-plugin-utils.c
# https://bugs.launchpad.net/intltool/+bug/1117944
sub/policy/org.freedesktop.NetworkManager.policy.in
sub/data/org.freedesktop.NetworkManager.policy.in