From 96d37386a149f3ab0ce10ab8a7aca68699bae651 Mon Sep 17 00:00:00 2001
From: Geoffrey Thomas <geofft@mit.edu>
Date: Tue, 25 Sep 2012 12:52:28 -0400
Subject: [PATCH] Undivert on deconfigure, not just on remove

See http://debathena.mit.edu/trac/ticket/388 for discussion. There are
more cases to think through here, but adding the deconfigure behavior is
correct and the most useful.
---
 divert.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/divert.mk b/divert.mk
index d352554..10e3c38 100644
--- a/divert.mk
+++ b/divert.mk
@@ -99,7 +99,7 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
 		fi;) \
 	    sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
 	    $(if $(divert_files_thispkg), \
-		echo 'if [ "$$1" = "remove" ]; then'; \
+		echo 'if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ]; then'; \
 		$(foreach file,$(call reverse_dh_compat_6,$(divert_files)), \
 		    echo "    undivert_unlink $(call divert_files_replace_name,$(file), )";) \
 		$(foreach file,$(call reverse_dh_compat_6,$(divert_remove_files)), \
-- 
2.45.0