[26989] in Source-Commits
/svn/athena r25875 - trunk/debathena/config/apparmor-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Mar 29 12:41:43 2013
Date: Fri, 29 Mar 2013 12:41:37 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303291641.r2TGfbrl012385@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-29 12:41:36 -0400 (Fri, 29 Mar 2013)
New Revision: 25875
Modified:
trunk/debathena/config/apparmor-config/debian/changelog
trunk/debathena/config/apparmor-config/debian/rules
Log:
In apparmor-config:
* Undivert things that we conditionally divert (Trac: #866)
Modified: trunk/debathena/config/apparmor-config/debian/changelog
===================================================================
--- trunk/debathena/config/apparmor-config/debian/changelog 2013-03-29 14:25:23 UTC (rev 25874)
+++ trunk/debathena/config/apparmor-config/debian/changelog 2013-03-29 16:41:36 UTC (rev 25875)
@@ -1,3 +1,9 @@
+debathena-apparmor-config (1.2.3) unstable; urgency=low
+
+ * Undivert things that we conditionally divert (Trac: #866)
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 29 Mar 2013 12:41:20 -0400
+
debathena-apparmor-config (1.2.2) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Modified: trunk/debathena/config/apparmor-config/debian/rules
===================================================================
--- trunk/debathena/config/apparmor-config/debian/rules 2013-03-29 14:25:23 UTC (rev 25874)
+++ trunk/debathena/config/apparmor-config/debian/rules 2013-03-29 16:41:36 UTC (rev 25875)
@@ -3,33 +3,46 @@
DEB_DIVERT_EXTENSION = .debathena
ifneq ($(wildcard /etc/apparmor.d/abstractions/kerberosclient),)
DEB_TRANSFORM_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/kerberosclient.debathena
+else
+ DEB_UNDIVERT_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/kerberosclient.debathena
endif
ifneq ($(wildcard /etc/apparmor.d/abstractions/cups-client),)
DEB_TRANSFORM_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/cups-client.debathena
+else
+ DEB_UNDIVERT_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/cups-client.debathena
endif
ifneq ($(wildcard /etc/apparmor.d/abstractions/X),)
DEB_TRANSFORM_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/X.debathena
+else
+ DEB_UNDIVERT_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/X.debathena
endif
ifneq ($(wildcard /etc/apparmor.d/abstractions/nameservice),)
DEB_TRANSFORM_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/nameservice.debathena
+else
+ DEB_UNDIVERT_FILES_debathena-apparmor-config += /etc/apparmor.d/abstractions/nameservice.debathena
endif
ifneq ($(wildcard /etc/apparmor.d/tunables/home),)
ifeq ($(wildcard /etc/apparmor.d/tunables/home.d),)
# Needed for anything older than Lucid
+ # Reverse case handled in postinst
DEB_TRANSFORM_FILES_debathena-apparmor-config += /etc/apparmor.d/tunables/home.debathena
endif
endif
ifneq ($(wildcard /etc/apparmor.d/usr.sbin.cupsd),)
DEB_REMOVE_FILES_debathena-apparmor-config += /etc/apparmor.d/usr.sbin.cupsd
+else
+ DEB_UNREMOVE_FILES_debathena-apparmor-config += /etc/apparmor.d/usr.sbin.cupsd
endif
ifneq ($(wildcard /etc/apparmor.d/usr.sbin.ntpd),)
DEB_REMOVE_FILES_debathena-apparmor-config += /etc/apparmor.d/usr.sbin.ntpd
+else
+ DEB_UNREMOVE_FILES_debathena-apparmor-config += /etc/apparmor.d/usr.sbin.ntpd
endif
include /usr/share/cdbs/1/rules/debhelper.mk
