[Python-modules-commits] [python-numpy] 01/01: Merge remote-tracking branch 'origin/sid'

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-numpy.

commit 12d41dc621bef85152d00956b0f0650dfe603395
Merge: f4ff69a 7ca7ab7
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jan 11 23:45:51 2016 +0000

    Merge remote-tracking branch 'origin/sid'

 debian/changelog                  | 23 +++++++++++++++++++++++
 debian/patches/ppc_noassert.patch | 19 +++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 43 insertions(+)

diff --cc debian/changelog
index 67433c2,2393e86..e09d857
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,26 +1,59 @@@
 +python-numpy (1:1.10.4-1) unstable; urgency=medium
 +
 +  * New upstream release
 +    - fix a typo in help(numpy.kron); Closes: #777172
 +    - generate the referene content in the doc; Closes: #804479
 +  * debian/copyright
 +    - extend packaging copyright notice
 +  * dh_numpy and dh_numpy3 use 2 different files from where to read the
 +    versions, thus making the py3k package indipendent of the python2;
 +    Closes: #797943
 +  * debian/rules
 +    - dont fail when files are missing if we are running dpkg-bp -A;
 +      Closes: #806099
 +  * debian/patches/0005-Dont-fail-if-we-cant-import-mingw32.patch
 +    - skip the import of mingw32(), needed for the version.helper scripts
 +
 + -- Sandro Tosi <morph at debian.org>  Sun, 10 Jan 2016 22:58:41 +0000
 +
 +python-numpy (1:1.10.0~b1-1) experimental; urgency=medium
 +
 +  * New upstream beta release
 +  * debian/patches/*
 +    - refreshed for new upstream code
 +  * debian/versions
 +    - bump API version to 10
 +  * debian/control
 +    - require nose version 1.0 or later
 +  * debian/copyright
 +    - extend upstream packaging years
 +    - remove/update copyright notice for updated files
 +
 + -- Sandro Tosi <morph at debian.org>  Wed, 12 Aug 2015 21:51:29 +0100
 +
+ python-numpy (1:1.9.2-5) unstable; urgency=medium
+ 
+   * debian/patches/ppc_noassert.patch
+     - fix 'if defined()' syntax, and select only powerpc and not powerpc64 as
+       well; thanks to Emilio Pozuelo Monfort
+ 
+  -- Sandro Tosi <morph at debian.org>  Thu, 01 Oct 2015 23:30:10 +0100
+ 
+ python-numpy (1:1.9.2-4) unstable; urgency=medium
+ 
+   * debian/patches/ppc_noassert.patch
+     - use the same powerpc macro as used in npy_cpu.h
+ 
+  -- Sandro Tosi <morph at debian.org>  Thu, 01 Oct 2015 20:17:05 +0100
+ 
+ python-numpy (1:1.9.2-3) unstable; urgency=medium
+ 
+   * debian/patches/ppc_noassert.patch
+     - disable assert on PowerPC due to broken malloc; thanks to Julian Taylor
+       for the patch; Closes: #800392
+ 
+  -- Sandro Tosi <morph at debian.org>  Wed, 30 Sep 2015 21:23:26 +0100
+ 
  python-numpy (1:1.9.2-2) unstable; urgency=medium
  
    * upload to unstable
diff --cc debian/patches/series
index 144bd6b,1885b1e..69a9e86
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -3,4 +2,5 @@@
  10_use_local_python.org_object.inv_sphinx.diff
  python3-soabi.patch
  adapt_swig_docs_to_debian.patch
 +0005-Dont-fail-if-we-cant-import-mingw32.patch
+ ppc_noassert.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-numpy.git