[cmor] 13/13: * Do not ship json-c include files; depend on libjson-c-dev. Closes: #849941 * Disable tests, segfault on some archs

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit bc944256fe08c495808e766d3c672de782a42d53
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jan 3 12:32:51 2017 +0000

    * Do not ship json-c include files; depend on libjson-c-dev. Closes: #849941
    * Disable tests, segfault on some archs
---
 debian/changelog           | 12 ++++++++++++
 debian/control             |  3 ++-
 debian/libcmor-dev.install |  2 +-
 debian/rules               |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecc3aee..c6b2db2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+cmor (3.2.1-3) unstable; urgency=medium
+
+  * Do not ship json-c include files; depend on libjson-c-dev. Closes: #849941
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 03 Jan 2017 12:31:41 +0000
+
+cmor (3.2.1-2) unstable; urgency=medium
+
+  * Disable tests, segfault on some archs
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 24 Dec 2016 08:14:24 +0000
+
 cmor (3.2.1-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 8607668..40584bc 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,8 @@ Description: Climate Model Output Rewriter library
 Package: libcmor-dev
 Section: libdevel
 Architecture: any
-Depends: libcmor2 ( = ${binary:Version}), ${misc:Depends}
+Depends: libcmor2 ( = ${binary:Version}), ${misc:Depends},
+ libjson-c-dev
 Recommends: pkg-config
 Description: Development files for Climate Model Output Rewriter
  The "Climate Model Output Rewriter" (CMOR, pronounced "Seymour") 
diff --git a/debian/libcmor-dev.install b/debian/libcmor-dev.install
index b903367..2e1093e 100644
--- a/debian/libcmor-dev.install
+++ b/debian/libcmor-dev.install
@@ -1,2 +1,2 @@
-/usr/include/*	usr/include
+/usr/include/c*	usr/include
 usr/bin/PrePARE.py
diff --git a/debian/rules b/debian/rules
index 969d567..566b2c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ export CFLAGS:=-I/usr/include/ossp  -fstack-protector \
 	--param=ssp-buffer-size=4 -Wformat -Wformat-security\
 	-Werror=format-security  $(CFLAGS)
 
-DO_TEST:=true
+DO_TEST:=false
 ifeq ($(BUILD_ARCH_OS)-$(BUILD_ARCH_CPU),kfreebsd-i386)
    DO_TEST:=false
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git