shedskin-packaging

Changeset

91:1ad029aaf7dc
2014-08-13 Paul Boddie raw files shortlog changelog graph Attempted to fix #757125. shedskin-0.9.2
debian/changelog (file) debian/patches/ftruncate-e6f52ae5.patch (file) debian/patches/gcc47-2ec08291.patch (file) debian/patches/gcc47-ff5a4cdd.patch (file) debian/patches/series (file) quiltrc (file)
     1.1 --- a/debian/changelog	Sat Jun 22 16:06:32 2013 +0200
     1.2 +++ b/debian/changelog	Wed Aug 13 17:01:22 2014 +0200
     1.3 @@ -1,20 +1,8 @@
     1.4 -shedskin (0.9.4-1) unstable; urgency=low
     1.5 -
     1.6 -  * New upstream release.
     1.7 -
     1.8 - -- Paul Boddie <paul@boddie.org.uk>  Sat, 22 Jun 2013 15:25:57 +0200
     1.9 -
    1.10 -shedskin (0.9.3-1) unstable; urgency=low
    1.11 +shedskin (0.9.2-2) stable; urgency=low
    1.12  
    1.13 -  * New upstream release.
    1.14 -
    1.15 - -- Paul Boddie <paul@boddie.org.uk>  Mon, 06 May 2013 11:42:13 +0200
    1.16 +  * Added missing includes and gcc fixes (Closes: #757125)
    1.17  
    1.18 -shedskin (0.9.3-0~exp1) experimental; urgency=low
    1.19 -
    1.20 -  * New upstream release.
    1.21 -
    1.22 - -- Paul Boddie <paul@boddie.org.uk>  Tue, 29 Jan 2013 23:24:04 +0100
    1.23 + -- Paul Boddie <paul@boddie.org.uk>  Wed, 13 Aug 2014 16:57:41 +0200
    1.24  
    1.25  shedskin (0.9.2-1) unstable; urgency=low
    1.26  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/debian/patches/ftruncate-e6f52ae5.patch	Wed Aug 13 17:01:22 2014 +0200
     2.3 @@ -0,0 +1,11 @@
     2.4 +--- a/shedskin/lib/builtin/file.cpp
     2.5 ++++ b/shedskin/lib/builtin/file.cpp
     2.6 +@@ -4,6 +4,8 @@
     2.7 + #include <io.h> // for _isatty
     2.8 + #endif // WIN32
     2.9 + 
    2.10 ++#include <unistd.h>
    2.11 ++
    2.12 + #if (_POSIX_C_SOURCE >= 1 or _XOPEN_SOURCE or _POSIX_SOURCE or _BSD_SOURCE or _SVID_SOURCE) and (_BSD_SOURCE or _SVID_SOURCE)
    2.13 + #define HAVE_STDIO_UNLOCKED
    2.14 + #endif
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/debian/patches/gcc47-2ec08291.patch	Wed Aug 13 17:01:22 2014 +0200
     3.3 @@ -0,0 +1,9 @@
     3.4 +--- a/examples/lib/serial.cpp
     3.5 ++++ b/examples/lib/serial.cpp
     3.6 +@@ -1,5 +1,6 @@
     3.7 + #include "serial.hpp"
     3.8 + #include <assert.h>
     3.9 ++#include <unistd.h>
    3.10 + 
    3.11 + namespace __serial__ {
    3.12 + 
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/debian/patches/gcc47-ff5a4cdd.patch	Wed Aug 13 17:01:22 2014 +0200
     4.3 @@ -0,0 +1,69 @@
     4.4 +--- a/shedskin/lib/builtin.hpp
     4.5 ++++ b/shedskin/lib/builtin.hpp
     4.6 +@@ -1203,10 +1203,10 @@
     4.7 + #include "builtin/list.hpp"
     4.8 + #include "builtin/tuple.hpp"
     4.9 + #include "builtin/str.hpp"
    4.10 ++#include "builtin/math.hpp"
    4.11 + #include "builtin/dict.hpp"
    4.12 + #include "builtin/set.hpp"
    4.13 + #include "builtin/file.hpp"
    4.14 +-#include "builtin/math.hpp"
    4.15 + #include "builtin/format.hpp"
    4.16 + #include "builtin/function.hpp"
    4.17 + #include "builtin/complex.hpp"
    4.18 +--- a/shedskin/lib/collections.hpp
    4.19 ++++ b/shedskin/lib/collections.hpp
    4.20 +@@ -237,7 +237,7 @@
    4.21 +     V __getitem__(K key) {
    4.22 +         register long hash = hasher<K>(key);
    4.23 +         register dictentry<K, V> *entry;
    4.24 +-        entry = lookup(key, hash);
    4.25 ++        entry = this->lookup(key, hash);
    4.26 +         if (entry->use != active)
    4.27 +             return __missing__(key);
    4.28 +         return entry->value;
    4.29 +@@ -255,10 +255,10 @@
    4.30 +     void *__addtoitem__(K key, V value) { /* XXX */
    4.31 +         register long hash = hasher<K>(key);
    4.32 +         register dictentry<K, V> *entry;
    4.33 +-        entry = lookup(key, hash);
    4.34 ++        entry = this->lookup(key, hash);
    4.35 +         if (entry->use != active) {
    4.36 +             if(func)
    4.37 +-                __setitem__(key, __add(func(), value));
    4.38 ++                this->__setitem__(key, __add(func(), value));
    4.39 +             else
    4.40 +                 throw new KeyError(repr(key));
    4.41 +         } else
    4.42 +@@ -281,7 +281,7 @@
    4.43 +         PyObject *iter = PyObject_GetIter(p);
    4.44 +         while(key = PyIter_Next(iter)) {
    4.45 +             value = PyDict_GetItem(p, key);
    4.46 +-            __setitem__(__to_ss<K>(key), __to_ss<V>(value));
    4.47 ++            this->__setitem__(__to_ss<K>(key), __to_ss<V>(value));
    4.48 +             Py_DECREF(key);
    4.49 +         }
    4.50 +         Py_DECREF(iter);
    4.51 +--- a/shedskin/lib/os/__init__.cpp
    4.52 ++++ b/shedskin/lib/os/__init__.cpp
    4.53 +@@ -23,9 +23,7 @@
    4.54 + #include <sysexits.h>
    4.55 + #endif
    4.56 + 
    4.57 +-namespace std {
    4.58 + #include <unistd.h>
    4.59 +-}
    4.60 + 
    4.61 + #ifdef WIN32
    4.62 + #include <windows.h>
    4.63 +--- a/shedskin/lib/socket.cpp
    4.64 ++++ b/shedskin/lib/socket.cpp
    4.65 +@@ -13,6 +13,7 @@
    4.66 + #include "socket.hpp"
    4.67 + #include <climits>
    4.68 + #include <fcntl.h>
    4.69 ++#include <unistd.h>
    4.70 + 
    4.71 + #ifdef WIN32
    4.72 + 
     5.1 --- a/debian/patches/series	Sat Jun 22 16:06:32 2013 +0200
     5.2 +++ b/debian/patches/series	Wed Aug 13 17:01:22 2014 +0200
     5.3 @@ -1,1 +1,4 @@
     5.4  setup.py.patch
     5.5 +ftruncate-e6f52ae5.patch
     5.6 +gcc47-ff5a4cdd.patch
     5.7 +gcc47-2ec08291.patch
     6.1 --- a/quiltrc	Sat Jun 22 16:06:32 2013 +0200
     6.2 +++ b/quiltrc	Wed Aug 13 17:01:22 2014 +0200
     6.3 @@ -1,2 +1,3 @@
     6.4 +QUILT_PATCHES=debian/patches
     6.5  QUILT_DIFF_ARGS="--no-timestamps --no-index -pab"
     6.6  QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab"