Merge branch 'debian' into debian-release

* debian:
  Added gbp.conf file for easy building using g-b-p
  Medium urgency for faster propagation of RC bug fix into squeeze
  policy 3.9.1 + changes in debian/copyright
  adding thanks to Kumar
  Strict version dependency on NumPy to assure ABI compatibility in the future (Closes: #590737)

debian/changelog

@@ -1,3 +1,17 @@
+nipy (0.1.2+20100526-2) unstable; urgency=medium
+
+  * Strict version dependency on NumPy to assure ABI compatibility in the
+    future (Closes: #590737). Thanks Kumar Appaiah for the reminder.
+  * debian/copyright:
+    - Added missing copyrights/licenses
+    - Adjusted formatting to match DEP5 rev 135
+    - Citing BSD-3 license verbatim to be compliant with 3.9.0
+  * Boosted policy compliance to 3.9.1 (BSD-3 license verbatim)
+  * Medium urgency for faster propagation of RC bug fix into squeeze
+  * Added gbp.conf file for easy building using g-b-p
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Fri, 06 Aug 2010 11:17:05 -0400
+
 nipy (0.1.2+20100526-1) unstable; urgency=low
 
   * Fresh upstream snapshot -- needed a new orig.tar.gz since some

debian/control

@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: NeuroDebian Team <team@neuro.debian.net>
 Uploaders: Yaroslav Halchenko <debian@onerussian.com>, Michael Hanke <michael.hanke@gmail.com>
 Build-Depends: cdbs, debhelper (>= 7.0.50~), python-all-dev (>= 2.4), python-support (>= 0.6), python-scipy (>= 0.5), python-numpy (>= 1.2), python-matplotlib (>= 0.98.3), python-sphinx (>= 0.6), python-nifti (>> 0.20090302), liblapack-dev, python-nose, python-sympy, cython, liblapack-dev, python-all-dbg, python-numpy-dbg, python-scipy-dbg, cython-dbg, graphviz, dvipng
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://neuroimaging.scipy.org
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/nipy.git
 Vcs-Git: git://git.debian.org/git/pkg-exppsy/nipy.git

debian/copyright

@@ -1,26 +1,75 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Name: NiPy
-Upstream-Source-Location: http://github.com/nipy/nipy
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: NiPy
+Maintainer: Matthew Brett <matthew.brett@gmail.com>
+Source: http://github.com/nipy/nipy
+
 
 Files: *
-Copyright: Copyright, 2006-2010, NIPY Developers
+Copyright: 2006-2010, NIPY Developers
+License: BSD-3
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+  .
+  * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+  * Neither the name of the NIPY Developers nor the names of any
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: nipy/io/imageformats/*
+Copyright: 2006-2010, Michael Hanke <michael.hanke@gmail.com>
+           2009-2010, Matthew Brett <matthew.brett@gmail.com>
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+Files: nipy/io/imageformats/testing/lightunit.py
+Copyright: 2009, The IPython Development Team
 License: BSD-3
-  On Debian GNU/Linux systems, the complete text of the 3-clause BSD License
-  can be found in `/usr/share/common-licenses/BSD'.
 
 Files: nipy/neurospin/*
-Copyright: Copyright, 2003-2010, CEA-INRIA-INSERM
+Copyright: 2003-2010, CEA-INRIA-INSERM
 License: BSD-3
 
 Files: examples/neurospin/neurospy/configobj.py
-Copyright: Copyright,
-   2005-2006, Michael Foord <fuzzyman AT voidspace DOT org DOT uk>
-   2005-2006, Nicola Larosa <nico AT tekNico DOT net>
+Copyright: 2005-2006, Michael Foord <fuzzyman AT voidspace DOT org DOT uk>
+           2005-2006, Nicola Larosa <nico AT tekNico DOT net>
 License: BSD-3
 
 Files: libfffpy/randomkit/distributions.c
-Copyright: Copyright,
-   2005, Robert Kern <robert.kern@gmail.com>
+Copyright: 2005, Robert Kern <robert.kern@gmail.com>
 License: Expat
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the
@@ -42,17 +91,15 @@ License: Expat
    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: libfffpy/randomkit/randomkit.c
-Copyright: Copyright,
-    2003-2005, Jean-Sebastien Roy <js@jeannot.org>
-    1997-2002, Makoto Matsumoto and Takuji Nishimura
+Copyright: 2003-2005, Jean-Sebastien Roy <js@jeannot.org>
+           1997-2002, Makoto Matsumoto and Takuji Nishimura
 License: BSD-3
 
 Files: nipy/fixes/scipy/stats/models
-Copyright: Copyright, 2006, Jonathan E. Taylor
+Copyright: 2006, Jonathan E. Taylor
 License: BSD-3
 
 Files: debian/*
-Copyright: Copyright 2009, 2010,
-    Yaroslav Halchenko <debian@onerussian.com>
-    Michael Hanke <michael.hanke@gmail.com>
+Copyright: 2009-2010, Yaroslav Halchenko <debian@onerussian.com>
+           2009-2010, Michael Hanke <michael.hanke@gmail.com>
 License: BSD-3

debian/gbp.conf

@@ -0,0 +1,25 @@
+[DEFAULT]
+# the default build command:
+builder = debuild -i'\.(git\.*|gbp.conf|gitignore)'
+# the default clean command:
+cleaner = fakeroot debian/rules clean
+# the default branch for upstream sources:
+upstream-branch = master
+# the default branch for the debian patch:
+debian-branch = debian-release
+# the default tag formats used:
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+
+# Options only affecting git-buildpackage
+[git-buildpackage]
+# ignore some any non-gitted files
+#ignore-new = True
+#upstream-branch = dfsgclean
+# uncomment this to automatically GPG sign tags
+sign-tags = True
+# use this for more svn-buildpackage like bahaviour:
+export-dir = ../build-area/
+tarball-dir = ../tarballs/
+
+

debian/rules

@@ -46,6 +46,8 @@ override_dh_auto_install:
 	mv debian/tmp/* debian/python-nipy/
 	: # I: Fix up interpreter which might be -dbg one
 	sed -i -e 's,/usr/bin/python-dbg,/usr/bin/python,g' debian/python-nipy/usr/bin/*
+	: # I: Assure versioned dependency on NumPy
+	if [ -x /usr/bin/dh_numpy ]; then dh_numpy;	fi
 
 ## immediately useable documentation and exemplar scripts/data
 override_dh_compress: