[numexpr] 02/03: New upstream release (patch referesh)

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository numexpr.

commit b8cacee3227beac8a00d65006d302f74a80bf0aa
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Sep 7 15:30:36 2013 +0000

    New upstream release (patch referesh)
---
 debian/changelog                          |    6 ++-
 debian/patches/0002-Pthread-license.patch |   80 -----------------------------
 debian/patches/series                     |    1 -
 3 files changed, 5 insertions(+), 82 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 550c8ae..c307b57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-numexpr (2.1-2) UNRELEASED; urgency=low
+numexpr (2.2-1) UNRELEASED; urgency=low
 
+  * New upstream release
   * Added a link to extra license info for win32/pthread.* in the
     copyright file
+  * debian/patches
+    - refresh all patches
+    - drop 0002-Pthread-license.patch (applied upstream)
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 27 Jul 2013 17:05:50 +0000
 
diff --git a/debian/patches/0002-Pthread-license.patch b/debian/patches/0002-Pthread-license.patch
deleted file mode 100644
index 0fb0609..0000000
--- a/debian/patches/0002-Pthread-license.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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 3be0c5f..dbfc991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-debian-changes-1.3.1-1.patch
-0002-Pthread-license.patch

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