[Pkg-urxvt-maintainers] [SCM] Git repository for pkg-urxvt branch, master, updated. debian/9.10-2-7-g22ff64a
Ryan Kavanagh
ryanakca-guest at alioth.debian.org
Mon May 2 14:10:24 UTC 2011
The following commit has been merged in the master branch:
commit bd2added8ed835e11c247821b0167f3dd7f55b7e
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date: Mon May 2 09:38:35 2011 -0400
Drop 14_path_max.diff, applied upstream
This reverts commit 51b3f3dd6e27b2608af7d293a5c08d534874d139.
Conflicts:
debian/patches/series
---
debian/patches/14_path_max.diff | 66 ---------------------------------------
debian/patches/series | 1 -
2 files changed, 0 insertions(+), 67 deletions(-)
diff --git a/debian/patches/14_path_max.diff b/debian/patches/14_path_max.diff
deleted file mode 100644
index 6574885..0000000
--- a/debian/patches/14_path_max.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Fix FTBFS on hurd due to unset PATH_MAX
- .
- Commited upstream, this patch is to be dropped with 9.11-1.
-Author: Emanuele Giaquinta
-Origin: upstream
-Bug-Debian: http://bugs.debian.org/624736
-Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Updated: 2011-05-01
-
-Index: pkg-urxvt/src/rxvt.h
-===================================================================
---- pkg-urxvt.orig/src/rxvt.h 2011-05-01 10:38:55.507910555 -0400
-+++ pkg-urxvt/src/rxvt.h 2011-05-01 10:38:59.407929902 -0400
-@@ -119,10 +119,6 @@
- # define EXIT_FAILURE 1 /* exit function failure */
- #endif
-
--#ifndef PATH_MAX
--# define PATH_MAX 16384
--#endif
--
- /****************************************************************************/
-
- // exception thrown on fatal (per-instance) errors
-Index: pkg-urxvt/src/rxvtc.C
-===================================================================
---- pkg-urxvt.orig/src/rxvtc.C 2011-05-01 10:38:55.547910756 -0400
-+++ pkg-urxvt/src/rxvtc.C 2011-05-01 10:38:59.407929902 -0400
-@@ -33,8 +33,6 @@
- #include "rxvtdaemon.h"
- #include "libptytty.h"
-
--#include "rxvt.h"
--
- #define STATUS_SUCCESS 0
- #define STATUS_FAILURE 1
- #define STATUS_CONNECTION_FAILED 2
-Index: pkg-urxvt/src/rxvtdaemon.C
-===================================================================
---- pkg-urxvt.orig/src/rxvtdaemon.C 2011-05-01 10:38:55.595910994 -0400
-+++ pkg-urxvt/src/rxvtdaemon.C 2011-05-01 10:38:59.411929916 -0400
-@@ -29,7 +29,6 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/utsname.h>
--#include <limits.h>
-
- #include "rxvtdaemon.h"
-
-Index: pkg-urxvt/src/rxvtdaemon.h
-===================================================================
---- pkg-urxvt.orig/src/rxvtdaemon.h 2011-05-01 10:38:55.639911213 -0400
-+++ pkg-urxvt/src/rxvtdaemon.h 2011-05-01 10:38:59.411929916 -0400
-@@ -1,6 +1,12 @@
- #ifndef RXVT_DAEMON_H
- #define RXVT_DAEMON_H
-
-+#include <limits.h>
-+
-+#ifndef PATH_MAX
-+# define PATH_MAX 16384
-+#endif
-+
- #include "rxvtutil.h"
-
- struct rxvt_connection
diff --git a/debian/patches/series b/debian/patches/series
index 70f21fa..3051529 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
08_rebuild_docs.diff
11_fix_lexgrog.diff
12_hyphen_minus_sign.diff
-14_path_max.diff
--
Git repository for pkg-urxvt
More information about the Pkg-urxvt-maintainers
mailing list