Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refresh, clean up and add DEP-3 headers to patches

  • Loading branch information...
commit 4b8181f0efb7c3d5c06f720c2fef679a859c6aa0 1 parent cc37867
@orebokech orebokech authored
View
16 debian/patches/01_no_epoll.diff
@@ -1,16 +0,0 @@
-Disable epoll on Linux since our libevent is new enough to have
-a fixed select/poll backend.
----
- osdep-linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/osdep-linux.c
-+++ b/osdep-linux.c
-@@ -71,6 +71,6 @@
- * poll or select, causing hangs.
- *
- */
-- /* setenv("EVENT_NOEPOLL", "1", 1); */
-+ setenv("EVENT_NOEPOLL", "1", 1);
- return (event_init());
- }
View
25 debian/patches/07_fix_hyphen.diff → debian/patches/lintian-manpage-hyphen.diff
@@ -1,8 +1,7 @@
-# fixes lintian's complains about missing hyphens.
----
-# tmux.1 | 42 +++++++++++++++++++++---------------------
-# 1 file changed, 21 insertions(+), 21 deletions(-)
-#
+Description: Fix lintian warning about hyphen used as minus sign
+Author: Karl Ferdinand Ebert <kfebert@gmail.com>
+Forwarded: not-needed
+
--- a/tmux.1
+++ b/tmux.1
@@ -450,7 +450,7 @@
@@ -47,7 +46,7 @@
.Ed
.Sh CLIENTS AND SESSIONS
The
-@@ -1028,7 +1028,7 @@
+@@ -1041,7 +1041,7 @@
and the result executed as a command.
If
.Ar template
@@ -56,7 +55,7 @@
This command works only from inside
.Nm .
.It Xo
-@@ -1045,7 +1045,7 @@
+@@ -1058,7 +1058,7 @@
and the result executed as a command.
If
.Ar template
@@ -65,7 +64,7 @@
This command works only from inside
.Nm .
.It Xo
-@@ -1062,7 +1062,7 @@
+@@ -1075,7 +1075,7 @@
and the result executed as a command.
If
.Ar template
@@ -74,7 +73,7 @@
This command works only from inside
.Nm .
.It Ic display-panes Op Fl t Ar target-client
-@@ -1304,7 +1304,7 @@
+@@ -1317,7 +1317,7 @@
option only opens a new pipe if no previous pipe exists, allowing a pipe to
be toggled with a single key, for example:
.Bd -literal -offset indent
@@ -83,7 +82,7 @@
.Ed
.It Xo Ic previous-layout
.Op Fl t Ar target-window
-@@ -2139,7 +2139,7 @@
+@@ -2156,7 +2156,7 @@
Examples are:
.Bd -literal -offset indent
#(sysctl vm.loadavg)
@@ -92,7 +91,7 @@
.Ed
.Pp
Where appropriate, special character sequences may be prefixed with a number to
-@@ -2343,7 +2343,7 @@
+@@ -2366,7 +2366,7 @@
.Ic rename-window .
It may be switched off globally with:
.Bd -literal -offset indent
@@ -101,7 +100,7 @@
.Ed
.Pp
.It Ic clock-mode-colour Ar colour
-@@ -2886,7 +2886,7 @@
+@@ -2914,7 +2914,7 @@
and the result executed as a command.
If
.Ar template
@@ -110,7 +109,7 @@
This command works only from inside
.Nm .
.It Ic clear-history Op Fl t Ar target-pane
-@@ -3091,29 +3091,29 @@
+@@ -3121,29 +3121,29 @@
.Pp
Changing the default prefix key:
.Bd -literal -offset indent
View
43 debian/patches/05_build_kfreebsd_hurd.diff → debian/patches/platform-quirks.diff
@@ -1,12 +1,18 @@
-# Enable kFreeBSD and Hurd specific configure script
----
-# configure | 2 +-
-# tmux.h | 16 ++++++++++++++++
-# 2 files changed, 17 insertions(+), 1 deletion(-)
-#
+Description: Build and configuration changes for Debian platforms
+ * Define MAXPATHLEN, PATH_MAX, MAXHOSTNAMELEN, MAX_IOV for Hurd.
+ * Disable libevent's epoll backend on Linux as calling epoll() on
+ /dev/null hangs.
+ * Disable cwd detection on FreeBSD since it requires the FreeBSD
+ version of libutil.
+Author: Karl Ferdinand Ebert <kfebert@gmail.com>
+Author: Romain Francoise <rfrancoise@debian.org>
+Bug-Debian: http://bugs.debian.org/609333
+Bug-Debian: http://bugs.debian.org/631984
+Forwarded: not-needed
+
--- a/tmux.h
+++ b/tmux.h
-@@ -396,6 +396,18 @@
+@@ -397,6 +397,22 @@
char argv[COMMAND_LENGTH];
};
@@ -22,20 +28,13 @@
+#define MAXHOSTNAMELEN 64
+#endif
+
- struct msg_identify_data {
- char cwd[MAXPATHLEN];
-
-@@ -1114,6 +1126,10 @@
- };
- RB_HEAD(status_out_tree, status_out);
-
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+
- /* Client connection. */
- struct client {
- struct imsgbuf ibuf;
+ struct msg_identify_data {
+ char cwd[MAXPATHLEN];
+
--- a/osdep-freebsd.c
+++ b/osdep-freebsd.c
@@ -29,7 +29,9 @@
@@ -64,3 +63,13 @@
return (NULL);
}
+--- a/osdep-linux.c
++++ b/osdep-linux.c
+@@ -88,6 +88,6 @@
+ * poll or select, causing hangs.
+ *
+ */
+- /* setenv("EVENT_NOEPOLL", "1", 1); */
++ setenv("EVENT_NOEPOLL", "1", 1);
+ return (event_init());
+ }
View
5 debian/patches/series
@@ -1,3 +1,2 @@
-01_no_epoll.diff
-05_build_kfreebsd_hurd.diff
-07_fix_hyphen.diff
+platform-quirks.diff
+lintian-manpage-hyphen.diff
Please sign in to comment.
Something went wrong with that request. Please try again.