From ababfa2aafd939f3cc478738844530b7343706c3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 10 Oct 2013 12:09:35 +0200
Subject: [PATCH] policy: Remove policy for removed features

---
 po/POTFILES.in                          |  1 -
 policy/Makefile.am                      |  3 --
 policy/org.freedesktop.upower.policy.in | 41 -------------------------
 3 files changed, 45 deletions(-)
 delete mode 100644 policy/org.freedesktop.upower.policy.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 77b0a8d..63aefc5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-policy/org.freedesktop.upower.policy.in
 policy/org.freedesktop.upower.qos.policy.in
 src/up-main.c
 tools/up-tool.c
diff --git a/policy/Makefile.am b/policy/Makefile.am
index 7a25230..ef39939 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -1,6 +1,5 @@
 polkit_policydir = $(datadir)/polkit-1/actions
 polkit_policy_DATA =					\
-	org.freedesktop.upower.policy		\
 	org.freedesktop.upower.qos.policy
 
 # You will need a recent intltool or the patch from this bug
@@ -8,11 +7,9 @@ polkit_policy_DATA =					\
 @INTLTOOL_POLICY_RULE@
 
 EXTRA_DIST =						\
-	org.freedesktop.upower.policy.in	\
 	org.freedesktop.upower.qos.policy.in
 
 DISTCLEANFILES =					\
-	org.freedesktop.upower.policy		\
 	org.freedesktop.upower.qos.policy
 
 clean-local :
diff --git a/policy/org.freedesktop.upower.policy.in b/policy/org.freedesktop.upower.policy.in
deleted file mode 100644
index 2800701..0000000
--- a/policy/org.freedesktop.upower.policy.in
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!--
-Policy definitions for UPower
-
-Copyright (c) 2008 David Zeuthen <david@fubar.dk>
-Copyright (c) 2008-2010 Richard Hughes <richard@hughsie.com>
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
--->
-
-<policyconfig>
-  <vendor>The UPower Project</vendor>
-  <vendor_url>http://upower.freedesktop.org/</vendor_url>
-  <icon_name>system-suspend</icon_name>
-
-  <action id="org.freedesktop.upower.suspend">
-    <_description>Suspend the system</_description>
-    <_message>Authentication is required to suspend the system</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.upower.hibernate">
-    <_description>Hibernate the system</_description>
-    <_message>Authentication is required to hibernate the system</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>