[24399] in Source-Commits
/svn/athena r23994 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Sep 7 18:31:13 2009
Date: Mon, 7 Sep 2009 18:30:58 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200909072230.n87MUwpd007029@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-09-07 18:30:58 -0400 (Mon, 07 Sep 2009)
New Revision: 23994
Added:
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/rules
Log:
In kerberos-config:
* Cleanup after a filename typo in 1.7.1 (usr.sbin.cups.debathena
shouldn't exist). (Trac: #319)
configure)
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2009-09-05 15:48:19 UTC (rev 23993)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2009-09-07 22:30:58 UTC (rev 23994)
@@ -1,3 +1,10 @@
+debathena-kerberos-config (1.8) unstable; urgency=low
+
+ * Cleanup after a filename typo in 1.7.1 (usr.sbin.cups.debathena
+ shouldn't exist). (Trac: #319)
+
+ -- Evan Broder <broder@mit.edu> Mon, 07 Sep 2009 18:26:39 -0400
+
debathena-kerberos-config (1.7.1) unstable; urgency=low
* Don't have AppArmor attempt to load all three of
Added: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst
===================================================================
--- trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst 2009-09-05 15:48:19 UTC (rev 23993)
+++ trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst 2009-09-07 22:30:58 UTC (rev 23994)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# postinst script for debathena-kerberos-config
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ configure)
+ if dpkg-query -f '${Conffiles}\n' -W debathena-kerberos-config | grep '/etc/apparmor.d/usr.sbin.cups.debathena' | awk '{ print $2" "$1 }' | md5sum -c >/dev/null 2>&1; then
+ rm -f /etc/apparmor.d/usr.sbin.cups.debathena
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Property changes on: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.postinst
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2009-09-05 15:48:19 UTC (rev 23993)
+++ trunk/debathena/config/kerberos-config/debian/rules 2009-09-07 22:30:58 UTC (rev 23994)
@@ -13,14 +13,16 @@
include /usr/share/cdbs/1/rules/config-package.mk
ifneq ($(wildcard /etc/apparmor.d/usr.sbin.cupsd),)
- common-build-indep:: debian/usr.sbin.cups.debathena
- debian/usr.sbin.cups.debathena: $(call debian_check_files,/etc/apparmor.d/usr.sbin.cupsd)
+ common-build-indep:: debian/usr.sbin.cupsd.debathena
+ debian/usr.sbin.cupsd.debathena: $(call debian_check_files,/etc/apparmor.d/usr.sbin.cupsd)
debian/transform_usr.sbin.cupsd.debathena < $< > $@
clean::
- -rm debian/usr.sbin.cups.debathena
+ -rm debian/usr.sbin.cupsd.debathena
install/debathena-kerberos-config::
- dh_install debian/usr.sbin.cups.debathena etc/apparmor.d
- DEB_REMOVE_FILES += /etc/apparmor.d/usr.sbin.cupsd
+ dh_install debian/usr.sbin.cupsd.debathena etc/apparmor.d
+ DEB_REMOVE_FILES_debathena-kerberos-config += /etc/apparmor.d/usr.sbin.cupsd
+else
+ DEB_UNREMOVE_FILES_debathena-kerberos-config += /etc/apparmor.d/usr.sbin.cupsd
endif
ifneq ($(wildcard /etc/apparmor.d/abstractions/kerberosclient),)
common-build-indep:: debian/kerberosclient.debathena
@@ -30,5 +32,7 @@
-rm debian/kerberosclient.debathena
install/debathena-kerberos-config::
dh_install debian/kerberosclient.debathena etc/apparmor.d/abstractions
- DEB_REMOVE_FILES += /etc/apparmor.d/abstractions/kerberosclient
+ DEB_REMOVE_FILES_debathena-kerberos-config += /etc/apparmor.d/abstractions/kerberosclient
+else
+ DEB_UNREMOVE_FILES_debathena-kerberos-config += /etc/apparmor.d/abstractions/kerberosclient
endif
