From f80a0e4f25e8b1c3b4945c6a68bc5c8fd4d92a4b Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Jul 02 2007 15:25:46 +0000
Subject: trunk: Add debian apcupsd binary location, from Stefan Schulze Frielinghaus.


---

diff --git a/Changelog b/Changelog
index 4f373f2..82e6e13 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+- Add debian apcupsd binary location, from Stefan Schulze Frielinghaus.
+
 * Fri Jun 29 2007 Chris PeBenito <selinux@tresys.com> - 20070629
 - Fix incorrectly named files_lib_filetrans_shared_lib() interface in the
   libraries module.
diff --git a/policy/modules/services/apcupsd.fc b/policy/modules/services/apcupsd.fc
index 1df86bb..85c1e26 100644
--- a/policy/modules/services/apcupsd.fc
+++ b/policy/modules/services/apcupsd.fc
@@ -1,3 +1,7 @@
+ifdef(`distro_debian',`
+/sbin/apcupsd			--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
+')
+
 /usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
 
 /var/log/apcupsd\.events.*	--	gen_context(system_u:object_r:apcupsd_log_t,s0)
diff --git a/policy/modules/services/apcupsd.te b/policy/modules/services/apcupsd.te
index c2a252b..d9c0d9b 100644
--- a/policy/modules/services/apcupsd.te
+++ b/policy/modules/services/apcupsd.te
@@ -1,5 +1,5 @@
 
-policy_module(apcupsd,1.1.0)
+policy_module(apcupsd,1.1.1)
 
 ########################################
 #