projects
/
debian
/
sudo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
88cf064
)
patch from Luca Capello to move LDAP examples into sudo-ldap/examples
author
Bdale Garbee
<bdale@gag.com>
Tue, 27 Sep 2011 01:15:37 +0000
(19:15 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Tue, 27 Sep 2011 01:15:37 +0000
(19:15 -0600)
debian/changelog
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index 5032595997b4904e3233806aa3d48d25aceb7d97..c19f36a8c99b11109af54a271cab6246a80be995 100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,8
+1,14
@@
sudo (1.8.2-2) UNRELEASED; urgency=low
sudo (1.8.2-2) UNRELEASED; urgency=low
+ [ Luca Capello ]
+ * debian/rules improvements, closes: #642535
+ + mv upstream sample.* files to the examples folder.
+ - do not call dh_installexamples.
+
+ [ Bdale Garbee ]
* patch from upstream for SIGBUS on sparc64, closes: #640304
* patch from upstream for SIGBUS on sparc64, closes: #640304
- -- Bdale Garbee <bdale@gag.com>
Fri, 16 Sep 2011 09:40:03
-0600
+ -- Bdale Garbee <bdale@gag.com>
Mon, 26 Sep 2011 19:14:59
-0600
sudo (1.8.2-1) unstable; urgency=low
sudo (1.8.2-1) unstable; urgency=low
diff --git
a/debian/rules
b/debian/rules
index c6ff65edb88a1b862be734811f3ce16d4fa12770..3f924fa9558037fbd95638101d31094e2af73b94 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-104,6
+104,12
@@
install: build-stamp
debian/sudo-ldap/usr/share/doc/sudo-ldap/
rmdir debian/sudo-ldap/usr/share/doc/sudo
debian/sudo-ldap/usr/share/doc/sudo-ldap/
rmdir debian/sudo-ldap/usr/share/doc/sudo
+ # move sample files to the examples folder
+ mv debian/sudo/usr/share/doc/sudo/sample.* \
+ debian/sudo/usr/share/doc/sudo/examples/
+ mv debian/sudo-ldap/usr/share/doc/sudo-ldap/sample.* \
+ debian/sudo-ldap/usr/share/doc/sudo-ldap/examples/
+
# and install things we do want that make install doesn't know about
install -o root -g root -m 0644 debian/sudo.pam \
debian/sudo/etc/pam.d/sudo
# and install things we do want that make install doesn't know about
install -o root -g root -m 0644 debian/sudo.pam \
debian/sudo/etc/pam.d/sudo
@@
-131,7
+137,6
@@
binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs -A
dh_testdir
dh_testroot
dh_installdocs -A
- dh_installexamples -A doc/sample.sudoers
dh_installinit -psudo -psudo-ldap --name=sudo
dh_installman -A
dh_installinfo -A
dh_installinit -psudo -psudo-ldap --name=sudo
dh_installman -A
dh_installinfo -A