From: Bdale Garbee <bdale@gag.com>
Date: Wed, 22 Sep 2010 05:19:36 +0000 (-0600)
Subject: fix delivery of multiple changelogs
X-Git-Tag: debian/1.7.4p4-3~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=65bcbb8c59546aaf9e2a5efe64e2a1abdadd075f;p=debian%2Fsudo

fix delivery of multiple changelogs
---

diff --git a/debian/changelog b/debian/changelog
index 06a38d1..7a1acb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sudo (1.7.4p4-3) unstable; urgency=low
 
   * make postinst clause for handling /var/run -> /var/lib transition less
     fragile, closes: #585514
+  * cope with upstream's Makefile trying to install ChangeLog in our doc
+    directory, closes: #597389
 
  -- Bdale Garbee <bdale@gag.com>  Thu, 09 Sep 2010 13:54:25 -0600
 
diff --git a/debian/rules b/debian/rules
index 2cfefa9..15f94a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,10 +93,9 @@ install: build-stamp
 	$(MAKE) -C build-ldap   install DESTDIR=$(CURDIR)/debian/sudo-ldap
 
 	# remove stuff we don't want
-	rm -f	debian/sudo/etc/sudoers \
-		debian/sudo-ldap/etc/sudoers \
-		debian/sudo/usr/share/doc/sudo/LICENSE* \
-		debian/sudo-ldap/usr/share/doc/sudo/LICENSE*
+	rm -f	debian/sudo*/etc/sudoers \
+		debian/sudo*/usr/share/doc/sudo/LICENSE* \
+		debian/sudo*/usr/share/doc/sudo/ChangeLog
 
 	# move upstream-installed docs to the right place for ldap package
 	mv	debian/sudo-ldap/usr/share/doc/sudo/* \