diff -Nru minc-2.2.00/debian/changelog minc-2.2.00/debian/changelog
--- minc-2.2.00/debian/changelog	2014-10-06 07:56:54.000000000 +0000
+++ minc-2.2.00/debian/changelog	2015-09-22 22:31:48.000000000 +0000
@@ -1,3 +1,18 @@
+minc (2.2.00-6+rpi2) stretch-staging; urgency=medium
+
+  * Add build-conflicts on obsolete libnetcdfc7
+  * Fix clean target
+  * Really disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Sep 2015 22:13:30 +0000
+
+minc (2.2.00-6+rpi1) stretch-staging; urgency=medium
+
+  * Disable testsuite.
+  * Disable libminc-dev binary package, taken over by source package libminc.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Sep 2015 21:12:38 +0000
+
 minc (2.2.00-6) unstable; urgency=medium
 
   * Apply two patches fixing Mahem test issues.  Thanks to Martin
diff -Nru minc-2.2.00/debian/control minc-2.2.00/debian/control
--- minc-2.2.00/debian/control	2014-10-06 07:48:37.000000000 +0000
+++ minc-2.2.00/debian/control	2015-09-22 22:16:24.000000000 +0000
@@ -11,6 +11,7 @@
                zlib1g-dev,
                texlive-latex-base,
                libhdf5-dev
+Build-conflicts: libnetcdfc7
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/minc/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/minc/trunk/
@@ -59,27 +60,28 @@
  simple and powerful and make no attempt to provide a pretty interface
  to users.
 
-Package: libminc-dev
-Architecture: any
-Section: libdevel
-Depends: ${misc:Depends},
-         libminc2-3 (= ${binary:Version}),
-         libnetcdf-dev,
-         libhdf5-dev
-Conflicts: libminc0-dev
-Replaces: libminc0-dev
-Description: MNI medical image format development environment
- This package contains the library and headers for libminc2 and
- libvolume_io2.
- .
- The Minc file format is a highly flexible medical image file format.
- Minc version 1 is built on top of the NetCDF generalized data format. 
- Minc version 2 is built on top of the HDF data format.  This library
- handles both formats.  In each case the format is
- simple, self-describing, extensible, portable and N-dimensional, with
- programming interfaces for both low-level data access and high-level
- volume manipulation. On top of the libraries is a suite of generic
- image-file manipulation tools. The format, libraries and tools are
- designed for use in a medical-imaging research environment : they are
- simple and powerful and make no attempt to provide a pretty interface
- to users.
+#Package: libminc-dev
+#Architecture: any
+#Section: libdevel
+#Depends: ${misc:Depends},#
+#         libminc2-3 (= ${binary:Version}),
+#         libnetcdf-dev,
+#         libhdf5-dev
+#Conflicts: libminc0-dev
+#Replaces: libminc0-dev
+#Description: MNI medical image format development environment
+# This package contains the library and headers for libminc2 and
+# libvolume_io2.
+# .
+# The Minc file format is a highly flexible medical image file format.
+# Minc version 1 is built on top of the NetCDF generalized data format. 
+# Minc version 2 is built on top of the HDF data format.  This library
+# handles both formats.  In each case the format is
+# simple, self-describing, extensible, portable and N-dimensional, with
+# programming interfaces for both low-level data access and high-level
+# volume manipulation. On top of the libraries is a suite of generic
+# image-file manipulation tools. The format, libraries and tools are
+# designed for use in a medical-imaging research environment : they are
+# simple and powerful and make no attempt to provide a pretty interface
+# to users.#
+#
\ No newline at end of file
diff -Nru minc-2.2.00/debian/rules minc-2.2.00/debian/rules
--- minc-2.2.00/debian/rules	2014-08-07 09:08:54.000000000 +0000
+++ minc-2.2.00/debian/rules	2015-09-22 22:31:17.000000000 +0000
@@ -6,9 +6,9 @@
 
 ARCH  := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # Tests are buggy; disable test on sparc
-ifeq ($(ARCH),sparc)
-	DEB_BUILD_OPTIONS += nocheck
-endif
+#ifeq ($(ARCH),sparc)
+	export DEB_BUILD_OPTIONS += nocheck
+#endif
 
 ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
   export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
@@ -43,7 +43,14 @@
 	# libminc2-3
 	dh_install -plibminc2-3 --autodest debian/tmp/usr/lib/*/lib*.so.*
 	# libminc-dev
-	dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so
-	dh_install -plibminc-dev --autodest  debian/tmp/usr/lib/*/lib*.a
-	dh_install -plibminc-dev --autodest  debian/tmp/usr/include
-	dh_installdocs -plibminc-dev $(ps_docs) debian/index.html
+	#dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so
+	#dh_install -plibminc-dev --autodest  debian/tmp/usr/lib/*/lib*.a
+	#dh_install -plibminc-dev --autodest  debian/tmp/usr/include
+	#dh_installdocs -plibminc-dev $(ps_docs) debian/index.html
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f progs/minccomplete/minccomplete.man1
+	rm -f progs/minchistory/minchistory.man1
+	rm -f progs/mincpik/mincpik.man1
+