From 65bcbb8c59546aaf9e2a5efe64e2a1abdadd075f Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 21 Sep 2010 23:19:36 -0600 Subject: [PATCH] fix delivery of multiple changelogs --- debian/changelog | 2 ++ debian/rules | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) 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 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/* \ -- 2.30.2