Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 342DC431FD2 for ; Wed, 16 Jan 2013 04:44:47 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fm0iKc9PwRP1 for ; Wed, 16 Jan 2013 04:44:45 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id C4174431FD4 for ; Wed, 16 Jan 2013 04:44:43 -0800 (PST) Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.82.78] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1TvSMC-0002S1-IG; Wed, 16 Jan 2013 08:44:42 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TvSM6-0004Hv-WC; Wed, 16 Jan 2013 08:44:35 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 3/5] debian/compat: upgrade to compat level 9 Date: Wed, 16 Jan 2013 08:44:20 -0400 Message-Id: <1358340262-16304-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358340262-16304-1-git-send-email-david@tethera.net> References: <1358340262-16304-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2013 12:44:48 -0000 From: David Bremner - 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 , David Bremner 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