tags 672076 + patch
thanks

diff -u libshevek-1.2/debian/changelog libshevek-1.2/debian/changelog
--- libshevek-1.2/debian/changelog
+++ libshevek-1.2/debian/changelog
@@ -1,3 +1,10 @@
+libshevek (1.2-1.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #672076.
+
+ -- Matthias Klose <[email protected]>  Tue, 08 May 2012 23:16:26 +0000
+
 libshevek (1.2-1) unstable; urgency=low
 
   * Remove build dependencies; let them be added to doxygen-latex instead.
only in patch2:
unchanged:
--- libshevek-1.2.orig/src/telnet.cc
+++ libshevek-1.2/src/telnet.cc
@@ -16,6 +16,7 @@
  */
 
 #include "telnet.hh"
+#include <unistd.h>
 
 namespace shevek
 {
@@ -79,7 +80,7 @@
          return &options[i];
       }
     // the type will be used in responses, so set it to the correct value
-    nop_option.type = opt;
+    nop_option.type = (enum option) opt;
     return &nop_option;
   }
 
only in patch2:
unchanged:
--- libshevek-1.2.orig/src/telnet.hh
+++ libshevek-1.2/src/telnet.hh
@@ -63,7 +63,7 @@
     typedef void (telnet::*action)(option_t *opt);
     struct option_t
     {
-      char type;
+      enum option type;
       action will, wont, doo, dont;
       bool here, there, not_both;
     };
only in patch2:
unchanged:
--- libshevek-1.2.orig/src/socket.cc
+++ libshevek-1.2/src/socket.cc
@@ -17,6 +17,7 @@
 
 #include "socket.hh"
 #include "error.hh"
+#include <unistd.h>
 
 namespace shevek
 {
only in patch2:
unchanged:
--- libshevek-1.2.orig/src/process.cc
+++ libshevek-1.2/src/process.cc
@@ -20,6 +20,7 @@
 #include "debug.hh"
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 extern "C"
 {
only in patch2:
unchanged:
--- libshevek-1.2.orig/src/file.cc
+++ libshevek-1.2/src/file.cc
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 namespace shevek
 {

Reply via email to