[PATCH 3/5] debian/compat: upgrade to compat level 9

diff --git a/1c/f9e196bab1c81c7a34b57df4003b79a9163d8a b/1c/f9e196bab1c81c7a34b57df4003b79a9163d8a
new file mode 100644 (file)
index 0000000..549a8c0
--- /dev/null
+++ b/1c/f9e196bab1c81c7a34b57df4003b79a9163d8a
@@ -0,0 +1,131 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 342DC431FD2\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jan 2013 04:44:47 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Fm0iKc9PwRP1 for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Jan 2013 04:44:45 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C4174431FD4\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Jan 2013 04:44:43 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TvSMC-0002S1-IG; Wed, 16 Jan 2013 08:44:42 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TvSM6-0004Hv-WC; Wed, 16 Jan 2013 08:44:35 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/5] debian/compat: upgrade to compat level 9\r
+Date: Wed, 16 Jan 2013 08:44:20 -0400\r
+Message-Id: <1358340262-16304-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1358340262-16304-1-git-send-email-david@tethera.net>\r
+References: <1358340262-16304-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 16 Jan 2013 12:44:48 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+- enable hardening\r
+\r
+- fix dh syntax. Now that we have compat level 9, the old, wrong\r
+  syntax is no longer accepted.\r
+\r
+- update debian/libnotmuch{3,-dev}.install for multiarch.\r
+\r
+- update versioned dependency on debhelper.\r
+---\r
+ debian/compat                 |    2 +-\r
+ debian/control                |    3 ++-\r
+ debian/libnotmuch-dev.install |    2 +-\r
+ debian/libnotmuch3.install    |    2 +-\r
+ debian/rules                  |    2 +-\r
+ 5 files changed, 6 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/debian/compat b/debian/compat\r
+index 7f8f011..ec63514 100644\r
+--- a/debian/compat\r
++++ b/debian/compat\r
+@@ -1 +1 @@\r
+-7\r
++9\r
+diff --git a/debian/control b/debian/control\r
+index d434c53..75b55a5 100644\r
+--- a/debian/control\r
++++ b/debian/control\r
+@@ -7,7 +7,7 @@ Uploaders:\r
+  martin f. krafft <madduck@debian.org>,\r
+  David Bremner <bremner@debian.org>\r
+ Build-Depends:\r
+- debhelper (>= 7.0.50~),\r
++ debhelper (>= 9),\r
+  pkg-config,\r
+  libxapian-dev,\r
+  libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,\r
+@@ -39,6 +39,7 @@ Package: libnotmuch3\r
+ Section: libs\r
+ Architecture: any\r
+ Depends: ${shlibs:Depends}, ${misc:Depends}\r
++Pre-Depends: ${misc:Pre-Depends}\r
+ Description: thread-based email index, search and tagging (runtime)\r
+  Notmuch is a system for indexing, searching, reading, and tagging\r
+  large collections of email messages in maildir or mh format. It uses\r
+diff --git a/debian/libnotmuch-dev.install b/debian/libnotmuch-dev.install\r
+index 185dba4..96bbd63 100644\r
+--- a/debian/libnotmuch-dev.install\r
++++ b/debian/libnotmuch-dev.install\r
+@@ -1,2 +1,2 @@\r
+ usr/include\r
+-usr/lib/libnotmuch.so\r
++usr/lib/*/libnotmuch.so\r
+diff --git a/debian/libnotmuch3.install b/debian/libnotmuch3.install\r
+index da4fc25..a513b47 100644\r
+--- a/debian/libnotmuch3.install\r
++++ b/debian/libnotmuch3.install\r
+@@ -1 +1 @@\r
+-usr/lib/libnotmuch.so.*\r
++usr/lib/*/libnotmuch.so.*\r
+diff --git a/debian/rules b/debian/rules\r
+index 603b3ab..8e30353 100755\r
+--- a/debian/rules\r
++++ b/debian/rules\r
+@@ -1,7 +1,7 @@\r
+ #!/usr/bin/make -f\r
+ \r
+ %:\r
+-      dh --with python2 $@\r
++      dh $@ --with python2\r
+ \r
+ override_dh_auto_configure:\r
+       dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch\r
+-- \r
+1.7.10.4\r
+\r