[SCM] Packaging for numexpr branch, master, updated. debian/2.0.1-2-25-g542e1c5

Tue Jul 23 17:18:40 UTC 2013

The following commit has been merged in the master branch:
commit 542e1c501443380435f7c7f1950ceb2596eb0085
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Tue Jul 16 17:24:46 2013 +0000

    Fix the pthread.* license statement in comment headers (new patch)

diff --git a/debian/changelog b/debian/changelog
index 79ccfa8..a54cf9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ numexpr (2.1-1) experimental; urgency=low
     0002-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch and
     0003-Set-default-nthreads-to-one-on-sparc.patch
   * Refresh remaining patches
+  * New patch: include the correct license statement in wine32/pthread.* 
+    comment headers
   * Standards version bumped to 3.9.4 (no change)
   * Compat set to 9
   * New packages for python3 and python3-dbg (Closes: #683954)
@@ -12,8 +14,7 @@ numexpr (2.1-1) experimental; urgency=low
   * Re-enable unittests at build time on sparc
   * The noopt option is now honored
   * numexpr 2.1 breaks pythbles < 3.0
-  * The copyright file has been updated. Now the
-    numexpr/win32/pthread.* license is correctly reported as GPL-2
+  * The copyright file has been updated.
   * Removed empty README.source file 
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 27 Apr 2013 10:32:31 +0000
diff --git a/debian/copyright b/debian/copyright
index ba08da3..2e81356 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,61 +14,10 @@ Copyright: 2007-2008 David M. Cooke <david.m.cooke at gmail.com>
                      Gaëtan de Menten
                      Antonio Valentino <antonio.valentino at tiscali.it>
 License: MIT
- 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: numexpr/win32/pthread.*
 Copyright: 2009 Andrzej K. Haczewski <ahaczewski at gmail.com>
-License: GPL-2
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License version 2 as published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
- .
- Note that the only valid version of the GPL as far as this project
- is concerned is _this_ particular version of the license (ie v2, not
- v2.2 or v3.x or whatever), unless explicitly otherwise stated.
- .
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
- a good idea, I also ask that people involved with the project make
- their preferences known. In particular, if you trust me to make that
- decision, you might note so in your copyright message, ie something
- like
- .
-  This file is licensed under the GPL v2, or a later version
-  at the discretion of Linus.
- .
- might avoid issues. But we can also just decide to synchronize and
- contact all copyright holders on record if/when the occasion arises.
+License: MIT
 
 Files: numexpr/cpuinfo.py
 Copyright: 2002  Pearu Peterson <pearu at cens.ioc.ee>
@@ -115,3 +64,22 @@ License: GPL-3.0
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: MIT
+ 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.
diff --git a/debian/patches/0001-debian-changes-1.3.1-1.patch b/debian/patches/0001-debian-changes-1.3.1-1.patch
index e51d7b3..7ca432b 100644
--- a/debian/patches/0001-debian-changes-1.3.1-1.patch
+++ b/debian/patches/0001-debian-changes-1.3.1-1.patch
@@ -1,14 +1,17 @@
-From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
 Date: Sun, 4 Mar 2012 12:04:34 +0100
 Subject: debian-changes-1.3.1-1
 
 ---
- numexpr.egg-info/SOURCES.txt |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ numexpr.egg-info/SOURCES.txt | 1 +
+ 1 file changed, 1 insertion(+)
 
+diff --git a/numexpr.egg-info/SOURCES.txt b/numexpr.egg-info/SOURCES.txt
+index f95273e..00dc3aa 100644
 --- a/numexpr.egg-info/SOURCES.txt
 +++ b/numexpr.egg-info/SOURCES.txt
-@@ -6,6 +6,7 @@
+@@ -6,6 +6,7 @@ LICENSE.txt
  MANIFEST.in
  README.txt
  RELEASE_NOTES.txt
diff --git a/debian/patches/0002-Pthread-license.patch b/debian/patches/0002-Pthread-license.patch
new file mode 100644
index 0000000..0fb0609
--- /dev/null
+++ b/debian/patches/0002-Pthread-license.patch
@@ -0,0 +1,80 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Tue, 16 Jul 2013 17:01:37 +0000
+Subject: Pthread license.
+
+The win32/pthread.* files are under MIT license.
+This patch updates the comment header of win32/pthread.* files to
+include the license statement.
+
+See https://code.google.com/p/numexpr/issues/detail?id=109.
+---
+ numexpr/win32/pthread.c | 18 ++++++++++++++++++
+ numexpr/win32/pthread.h | 26 +++++++++++++++++++++++++-
+ 2 files changed, 43 insertions(+), 1 deletion(-)
+
+diff --git a/numexpr/win32/pthread.c b/numexpr/win32/pthread.c
+index 28c089c..6d38d99 100644
+--- a/numexpr/win32/pthread.c
++++ b/numexpr/win32/pthread.c
+@@ -4,6 +4,24 @@
+  *
+  * Copyright (C) 2009 Andrzej K. Haczewski <ahaczewski at gmail.com>
+  *
++ * 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.
++ *
+  * DISCLAIMER: The implementation is Git-specific, it is subset of original
+  * Pthreads API, without lots of other features that Git doesn't use.
+  * Git also makes sure that the passed arguments are valid, so there's
+diff --git a/numexpr/win32/pthread.h b/numexpr/win32/pthread.h
+index d43f191..ff960c7 100644
+--- a/numexpr/win32/pthread.h
++++ b/numexpr/win32/pthread.h
+@@ -1,7 +1,31 @@
+ /*
+- * Header used to adapt pthread-based POSIX code to Windows API threads.
++ * Code for simulating pthreads API on Windows.  This is Git-specific,
++ * but it is enough for Numexpr needs too.
+  *
+  * Copyright (C) 2009 Andrzej K. Haczewski <ahaczewski at gmail.com>
++ *
++ * 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.
++ *
++ * DISCLAIMER: The implementation is Git-specific, it is subset of original
++ * Pthreads API, without lots of other features that Git doesn't use.
++ * Git also makes sure that the passed arguments are valid, so there's
++ * no need for double-checking.
+  */
+ 
+ #ifndef PTHREAD_H
diff --git a/debian/patches/series b/debian/patches/series
index dbfc991..3be0c5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-debian-changes-1.3.1-1.patch
+0002-Pthread-license.patch

-- 
Packaging for numexpr

