# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1407942082 -7200
# Node ID 1ad029aaf7dc468cf9f1fda6cfde3d9b8f282573
# Parent  b744d7c761f88dcabffa50b59f5aa0200c0c2332
Attempted to fix #757125.

diff -r b744d7c761f8 -r 1ad029aaf7dc debian/changelog
--- a/debian/changelog	Sat Jun 22 16:06:32 2013 +0200
+++ b/debian/changelog	Wed Aug 13 17:01:22 2014 +0200
@@ -1,20 +1,8 @@
-shedskin (0.9.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Paul Boddie <paul@boddie.org.uk>  Sat, 22 Jun 2013 15:25:57 +0200
-
-shedskin (0.9.3-1) unstable; urgency=low
+shedskin (0.9.2-2) stable; urgency=low
 
-  * New upstream release.
-
- -- Paul Boddie <paul@boddie.org.uk>  Mon, 06 May 2013 11:42:13 +0200
+  * Added missing includes and gcc fixes (Closes: #757125)
 
-shedskin (0.9.3-0~exp1) experimental; urgency=low
-
-  * New upstream release.
-
- -- Paul Boddie <paul@boddie.org.uk>  Tue, 29 Jan 2013 23:24:04 +0100
+ -- Paul Boddie <paul@boddie.org.uk>  Wed, 13 Aug 2014 16:57:41 +0200
 
 shedskin (0.9.2-1) unstable; urgency=low
 
diff -r b744d7c761f8 -r 1ad029aaf7dc debian/patches/ftruncate-e6f52ae5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/ftruncate-e6f52ae5.patch	Wed Aug 13 17:01:22 2014 +0200
@@ -0,0 +1,11 @@
+--- a/shedskin/lib/builtin/file.cpp
++++ b/shedskin/lib/builtin/file.cpp
+@@ -4,6 +4,8 @@
+ #include <io.h> // for _isatty
+ #endif // WIN32
+ 
++#include <unistd.h>
++
+ #if (_POSIX_C_SOURCE >= 1 or _XOPEN_SOURCE or _POSIX_SOURCE or _BSD_SOURCE or _SVID_SOURCE) and (_BSD_SOURCE or _SVID_SOURCE)
+ #define HAVE_STDIO_UNLOCKED
+ #endif
diff -r b744d7c761f8 -r 1ad029aaf7dc debian/patches/gcc47-2ec08291.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/gcc47-2ec08291.patch	Wed Aug 13 17:01:22 2014 +0200
@@ -0,0 +1,9 @@
+--- a/examples/lib/serial.cpp
++++ b/examples/lib/serial.cpp
+@@ -1,5 +1,6 @@
+ #include "serial.hpp"
+ #include <assert.h>
++#include <unistd.h>
+ 
+ namespace __serial__ {
+ 
diff -r b744d7c761f8 -r 1ad029aaf7dc debian/patches/gcc47-ff5a4cdd.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/gcc47-ff5a4cdd.patch	Wed Aug 13 17:01:22 2014 +0200
@@ -0,0 +1,69 @@
+--- a/shedskin/lib/builtin.hpp
++++ b/shedskin/lib/builtin.hpp
+@@ -1203,10 +1203,10 @@
+ #include "builtin/list.hpp"
+ #include "builtin/tuple.hpp"
+ #include "builtin/str.hpp"
++#include "builtin/math.hpp"
+ #include "builtin/dict.hpp"
+ #include "builtin/set.hpp"
+ #include "builtin/file.hpp"
+-#include "builtin/math.hpp"
+ #include "builtin/format.hpp"
+ #include "builtin/function.hpp"
+ #include "builtin/complex.hpp"
+--- a/shedskin/lib/collections.hpp
++++ b/shedskin/lib/collections.hpp
+@@ -237,7 +237,7 @@
+     V __getitem__(K key) {
+         register long hash = hasher<K>(key);
+         register dictentry<K, V> *entry;
+-        entry = lookup(key, hash);
++        entry = this->lookup(key, hash);
+         if (entry->use != active)
+             return __missing__(key);
+         return entry->value;
+@@ -255,10 +255,10 @@
+     void *__addtoitem__(K key, V value) { /* XXX */
+         register long hash = hasher<K>(key);
+         register dictentry<K, V> *entry;
+-        entry = lookup(key, hash);
++        entry = this->lookup(key, hash);
+         if (entry->use != active) {
+             if(func)
+-                __setitem__(key, __add(func(), value));
++                this->__setitem__(key, __add(func(), value));
+             else
+                 throw new KeyError(repr(key));
+         } else
+@@ -281,7 +281,7 @@
+         PyObject *iter = PyObject_GetIter(p);
+         while(key = PyIter_Next(iter)) {
+             value = PyDict_GetItem(p, key);
+-            __setitem__(__to_ss<K>(key), __to_ss<V>(value));
++            this->__setitem__(__to_ss<K>(key), __to_ss<V>(value));
+             Py_DECREF(key);
+         }
+         Py_DECREF(iter);
+--- a/shedskin/lib/os/__init__.cpp
++++ b/shedskin/lib/os/__init__.cpp
+@@ -23,9 +23,7 @@
+ #include <sysexits.h>
+ #endif
+ 
+-namespace std {
+ #include <unistd.h>
+-}
+ 
+ #ifdef WIN32
+ #include <windows.h>
+--- a/shedskin/lib/socket.cpp
++++ b/shedskin/lib/socket.cpp
+@@ -13,6 +13,7 @@
+ #include "socket.hpp"
+ #include <climits>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef WIN32
+ 
diff -r b744d7c761f8 -r 1ad029aaf7dc debian/patches/series
--- a/debian/patches/series	Sat Jun 22 16:06:32 2013 +0200
+++ b/debian/patches/series	Wed Aug 13 17:01:22 2014 +0200
@@ -1,1 +1,4 @@
 setup.py.patch
+ftruncate-e6f52ae5.patch
+gcc47-ff5a4cdd.patch
+gcc47-2ec08291.patch
diff -r b744d7c761f8 -r 1ad029aaf7dc quiltrc
--- a/quiltrc	Sat Jun 22 16:06:32 2013 +0200
+++ b/quiltrc	Wed Aug 13 17:01:22 2014 +0200
@@ -1,2 +1,3 @@
+QUILT_PATCHES=debian/patches
 QUILT_DIFF_ARGS="--no-timestamps --no-index -pab"
 QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab"