From: David Bremner <bremner@debian.org> - enable hardening - fix dh syntax. Now that we have compat level 9, the old, wrong syntax is no longer accepted. - update debian/libnotmuch{3,-dev}.install for multiarch. - update versioned dependency on debhelper. --- debian/compat | 2 +- debian/control | 3 ++- debian/libnotmuch-dev.install | 2 +- debian/libnotmuch3.install | 2 +- debian/rules | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index d434c53..75b55a5 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: martin f. krafft <madduck@debian.org>, David Bremner <bremner@debian.org> Build-Depends: - debhelper (>= 7.0.50~), + debhelper (>= 9), pkg-config, libxapian-dev, libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev, @@ -39,6 +39,7 @@ Package: libnotmuch3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: thread-based email index, search and tagging (runtime) Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses diff --git a/debian/libnotmuch-dev.install b/debian/libnotmuch-dev.install index 185dba4..96bbd63 100644 --- a/debian/libnotmuch-dev.install +++ b/debian/libnotmuch-dev.install @@ -1,2 +1,2 @@ usr/include -usr/lib/libnotmuch.so +usr/lib/*/libnotmuch.so diff --git a/debian/libnotmuch3.install b/debian/libnotmuch3.install index da4fc25..a513b47 100644 --- a/debian/libnotmuch3.install +++ b/debian/libnotmuch3.install @@ -1 +1 @@ -usr/lib/libnotmuch.so.* +usr/lib/*/libnotmuch.so.* diff --git a/debian/rules b/debian/rules index 603b3ab..8e30353 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh --with python2 $@ + dh $@ --with python2 override_dh_auto_configure: dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch -- 1.7.10.4