From bef39bbff8df124bddef0d58d279f9e3a28f3faf Mon Sep 17 00:00:00 2001
From: Jesse Michael <jmichael@suse.de>
Date: Fri, 30 Mar 2007 16:09:50 +0000
Subject: [PATCH] Add an empty install-debian: target to keep the makefile from
 blowing up when running on Debian/Ubuntu systems and also make the init
 script skip *.dpkg-new files when loading profiles.

---
 parser/Makefile              | 3 +++
 parser/rc.apparmor.functions | 1 +
 2 files changed, 4 insertions(+)

diff --git a/parser/Makefile b/parser/Makefile
index 17c652ee5..6289f4b64 100644
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -214,6 +214,9 @@ install-slackware:
 	install -m 755 -d $(DESTDIR)/etc/rc.d
 	install -m 755 rc.apparmor.$(subst install-,,$(@)) $(DESTDIR)/etc/rc.d/rc.apparmor
 
+.PHONY: install-debian
+install-debian:
+
 INSTALLDEPS=$(TOOLS)
 ifdef DISTRO
 INSTALLDEPS+=install-$(DISTRO)
diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
index 57cec7145..7e18b2450 100644
--- a/parser/rc.apparmor.functions
+++ b/parser/rc.apparmor.functions
@@ -137,6 +137,7 @@ parse_profiles() {
 	for profile in $PROFILE_DIR/*; do
 	        if [ "${profile%.rpmnew}" != "${profile}" -o \
 		     "${profile%.rpmsave}" != "${profile}" -o \
+		     "${profile%.dpkg-new}" != "${profile}" -o \
 		     "${profile%\~}" != "${profile}" ]
 		then 
 			echo " Skipping profile $profile"