summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2012-06-29 13:32:49 +0200
committerYves-Alexis Perez <corsac@corsac.net>2012-06-29 13:32:49 +0200
commitaa3a6c1b8a871328c9837e4cebd0933c903f5210 (patch)
tree948373185f0cdc09818092f47f7b4650e7bd74aa
parent20fc85e2d509b69cc12519548a1b1524c947d1cd (diff)
downloadvyos-strongswan-aa3a6c1b8a871328c9837e4cebd0933c903f5210.tar.gz
vyos-strongswan-aa3a6c1b8a871328c9837e4cebd0933c903f5210.zip
stop bypassing dh_installdocs.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules19
2 files changed, 1 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 56513481c..9f7dc9757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ strongswan (4.6.4-0.1) UNRELEASED; urgency=low
- ignore plugins in dh_makeshlibs.
- don't generate maintainer scripts snippets for init scripts, it's
already handled (atlhough we might want to change that later)
+ - stop bypassing dh_installdocs.
* debian/libstrongswan.lintian-overrides,
debian/libstrongswan-ikev2.lintian-overrides:
- override warning for hardening flags, we do use them.
diff --git a/debian/rules b/debian/rules
index b14b82890..443f1d172 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,31 +104,12 @@ endif
find $(CURDIR)/debian/*strongswan*/ -name ".cvsignore" | xargs --no-run-if-empty rm -f
find $(CURDIR)/debian/*strongswan*/ -name "/.svn/" | xargs --no-run-if-empty rm -rf
-
-override_dh_installdocs:
- dh_installdocs -pstrongswan -n
- # change the paths in the installed doc files (but only in regular
- # files, not in links to the outside of the build tree !)
- # TODO: check if we still need this
- ( cd $(CURDIR)/debian/strongswan/; \
- for f in `grep "/usr/local/" --recursive --files-with-match *`; \
- do \
- if [ -f $$f -a ! -L $$f ]; then \
- cp $$f $$f.old; \
- sed 's/\/usr\/local\//\/usr\//' $$f.old > $$f; \
- rm $$f.old; \
- fi; \
- done )
-
override_dh_installinit:
dh_installinit -n --name=ipsec
override_dh_installchangelogs:
dh_installchangelogs NEWS
-override_dh_installdocs:
- dh_installdocs README
-
override_dh_strip:
dh_strip --dbg-package=strongswan-dbg