[SCM] grits branch, master, updated. upstream/0.7-35-gd937933

[Andy Spencer]

The following commit has been merged in the master branch:
commit d937933b3f4d563ffa8a39f6b84993099322d342
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Mon Jan 28 02:33:41 2013 +0000

    Switch to debian/compat=9

diff --git a/debian/changelog b/debian/changelog
index 782b6b1..7fcb042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libgrits (0.8-1) unstable; urgency=low
   * New upstream release
   * Remove gmodule-2.0 patch
   * Change website urls
+  * Switch to compat=9 for hardening
 
  -- Andy Spencer <andy753421 at gmail.com>  Thu, 28 Jan 2013 02:05:15 +0000
 
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 60a5dc1..3e05adf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libgrits
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Andy Spencer <andy753421 at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf,
+Build-Depends: debhelper (>= 9), dh-autoreconf,
  libglib2.0-dev (>= 2.14), libgtk2.0-dev (>= 2.16), libcairo2-dev,
  libsoup2.4-dev (>= 2.26), mesa-common-dev, libglu1-mesa-dev
 Standards-Version: 3.9.4
@@ -14,6 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-grass/grits.git
 Package: libgrits5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: multiarch-support
 Description: Grits is a Virtual Globe library
  Grits is a "Virtual Globe" library which uses OpenGL to render an image of
  the earth using satellite and terrain data from publicly accessible servers.
diff --git a/debian/libgrits-dev.install b/debian/libgrits-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libgrits-dev.install
+++ b/debian/libgrits-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libgrits5.install b/debian/libgrits5.install
index 508fd5f..8b01e24 100644
--- a/debian/libgrits5.install
+++ b/debian/libgrits5.install
@@ -1,2 +1,2 @@
-usr/lib/grits*/*.so
-usr/lib/lib*.so.*
+usr/lib/*/grits*/*.so
+usr/lib/*/lib*.so.*
diff --git a/debian/libgrits5.lintian-overrides b/debian/libgrits5.lintian-overrides
new file mode 100644
index 0000000..adbdf12
--- /dev/null
+++ b/debian/libgrits5.lintian-overrides
@@ -0,0 +1,2 @@
+# False positives (see bug #695319)
+libgrits5: hardening-no-fortify-functions usr/lib/*/libgrits*

-- 
A Virtual Globe library