projects
/
debian
/
sudo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23c751e
)
fix delivery of multiple changelogs
author
Bdale Garbee
<bdale@gag.com>
Wed, 22 Sep 2010 05:19:36 +0000
(23:19 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Wed, 22 Sep 2010 05:19:36 +0000
(23:19 -0600)
debian/changelog
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index 06a38d17bc9b0934ce66dd9eafaaa3c26f6abc89..7a1acb45e651df2ccef6b3da13922eacbd638a25 100644
(file)
--- 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
* 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
-- Bdale Garbee <bdale@gag.com> Thu, 09 Sep 2010 13:54:25 -0600
diff --git
a/debian/rules
b/debian/rules
index 2cfefa971a1188677d24c860c54ec04211e9ba49..15f94a4bd037ead91d0700e166938f5c3a630591 100755
(executable)
--- 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
$(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/* \
# move upstream-installed docs to the right place for ldap package
mv debian/sudo-ldap/usr/share/doc/sudo/* \