Changeset 24112

Timestamp:

10/20/09 15:15:11 (5 weeks ago)

Author:

broder

Message:

In kerberos-config:

• Apparently /etc/apparmor.d/abstractions/kerberosclient has to still exist, so switch back to DEB_TRANSFORM_FILES for that, but keep using DEB_REMOVE_FILES for the CUPS config file.

Location:

trunk/debathena/config/kerberos-config/debian

Files:

• changelog (modified) (1 diff)
• debathena-kerberos-config.postinst (modified) (2 diffs)
• rules (modified) (1 diff)

trunk/debathena/config/kerberos-config/debian/changelog

@@ +1 @@
+debathena-kerberos-config (1.8.2) unstable; urgency=low
+
+  * Apparently /etc/apparmor.d/abstractions/kerberosclient has to still
+    exist, so switch back to DEB_TRANSFORM_FILES for that, but keep using
+    DEB_REMOVE_FILES for the CUPS config file.
+
+ -- Evan Broder <broder@mit.edu>  Tue, 20 Oct 2009 15:13:00 -0400
+
 debathena-kerberos-config (1.8.1) unstable; urgency=low
 

trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst

@@ -66 +66 @@
 }
 
+cleanup_old_removal() {
+    file="$1"
+    removedfile="$2"
+    if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${removedfile} by ${package}"; then
+        undivert_unlink_divert "$file"
+    fi
+}
+
 case "$1" in
     configure)
@@ -72 +80 @@
         fi
 
-        # This will only undo the old DEB_TRANSFORM_FILES diversions,
-        # not the DEB_REMOVE_FILES diversions that the package is
-        # adding.
+        # The cupsd config can be removed, but not diverted; the
+        # kerberosclient config can be diverted but not removed. Since
+        # both files have been both at various points in the package's
+        # history, if one of them is wrong, fix it before putting the
+        # diversion back in later on.
         cleanup_old_diversion /etc/apparmor.d/usr.sbin.cupsd
-        cleanup_old_diversion /etc/apparmor.d/abstractions/kerberosclient
+        cleanup_old_removal /etc/apparmor.d/abstractions/kerberosclient /usr/share/debathena-kerberos-config/etc++apparmor.d++abstractions++kerberosclient
 
         # Handle upgrading from a system with krb4 to one without

trunk/debathena/config/kerberos-config/debian/rules

@@ -35 +35 @@
 endif
 ifneq ($(wildcard /etc/apparmor.d/abstractions/kerberosclient),)
-    common-build-indep:: debian/kerberosclient.debathena
-    debian/kerberosclient.debathena: $(call debian_check_files,/etc/apparmor.d/abstractions/kerberosclient)
-        debian/transform_kerberosclient.debathena < $< > $@
-    clean::
-        -rm debian/kerberosclient.debathena
-    install/debathena-kerberos-config::
-        dh_install debian/kerberosclient.debathena etc/apparmor.d/abstractions
-    DEB_REMOVE_FILES_debathena-kerberos-config += /etc/apparmor.d/abstractions/kerberosclient
+    DEB_TRANSFORM_FILES_debathena-kerberos-config += /etc/apparmor.d/abstractions/kerberosclient
 endif