[SCM] ladish/master: Fix FTBFS with eglibc 2.17

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Jun 2 23:43:17 UTC 2013


The following commit has been merged in the master branch:
commit 87bc8ca848d9fe8018730fb81a3bcdc489d2fd8c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 3 01:36:03 2013 +0200

    Fix FTBFS with eglibc 2.17
    
    Closes: #701440

diff --git a/debian/changelog b/debian/changelog
index 02ee293..8064523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ladish (1+dfsg0-4) UNRELEASED; urgency=low
 
   * Team upload.
+  * debian/patches/eglibc-2.17.patch: Fix FTBFS with eglibc 2.17. (Closes:
+    #701440)
 
  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 03 Jun 2013 01:27:04 +0200
 
diff --git a/debian/patches/eglibc-2.17.patch b/debian/patches/eglibc-2.17.patch
new file mode 100644
index 0000000..d700dea
--- /dev/null
+++ b/debian/patches/eglibc-2.17.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with eglibc 2.17
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: http://bugs.debian.org/701440
+Last-Update: 2013-06-03
+
+--- ladish-1+dfsg0.orig/daemon/loader.c
++++ ladish-1+dfsg0/daemon/loader.c
+@@ -34,6 +34,8 @@
+ #include <fcntl.h>
+ #include <pty.h>                /* forkpty() */
+ #include <sys/wait.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ 
+ #include "loader.h"
+ #include "../proxies/conf_proxy.h"
diff --git a/debian/patches/series b/debian/patches/series
index f4db4ce..23076f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 2002-liblash_soname.patch
 0001-misspelling.patch
 0002-new_laditools.patch
+eglibc-2.17.patch

-- 
ladish packaging



More information about the pkg-multimedia-commits mailing list