[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.2 branch, master, updated. debian/1.2.15-1

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit c7f5cb9defa701eb763b27d0b3936115227a6a0d
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 17:02:18 2012 +0000

    Remove patch x11_add_support_NET_WM_PID.diff, it was applied upstream (changeset 6169 6f3e5ccfd585)

diff --git a/debian/patches/series b/debian/patches/series
index 8226c3d..a3b09e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ joystick_crash.diff
 dont_propagate_lpthread.diff
 fixmouseclicks.diff
 disappearingcursor.diff
-x11_add_support_NET_WM_PID.diff
diff --git a/debian/patches/x11_add_support_NET_WM_PID.diff b/debian/patches/x11_add_support_NET_WM_PID.diff
deleted file mode 100644
index a2fae2e..0000000
--- a/debian/patches/x11_add_support_NET_WM_PID.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Subject: [PATCH] X11: Added support to _NET_WM_PID and WM_CLIENT_MACHINE atoms
-Date: Tue, 28 Jun 2011 22:27:13 +0200
-From: Marco Trevisan (Treviño) <mail at 3v1n0.net>
-Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1189
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/777417
-
-# HG changeset patch
-# User Marco Trevisan (Treviño) <mail at 3v1n0.net>
-# Date 1309292807 -7200
-# Branch SDL-1.2
-# Node ID aa87bdcb6f5b3fdc83fbceda566705457fbcc2d1
-# Parent  80ae1ac3bdc9cbcc2932b6cfcfc322320f0d819d
-X11: Added support to _NET_WM_PID and WM_CLIENT_MACHINE atoms
-
-Add support to the _NET_WM_PID atom which is needed by many windows
-managers to correctly associate a SDL window to its process and to
-related .desktop file and icon for the given host.
-
-diff -r 80ae1ac3bdc9 -r aa87bdcb6f5b src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Sat Jun 04 15:34:32 2011 -0400
-+++ b/src/video/x11/SDL_x11video.c	Tue Jun 28 22:26:47 2011 +0200
-@@ -417,6 +417,25 @@
- 	}
-     }
- 
-+	{
-+		char hostname[256];
-+
-+		if (gethostname(hostname, sizeof(hostname)) > -1) {
-+			hostname[sizeof(hostname)-1] = '\0';
-+			pid_t pid = getpid();
-+
-+			if (pid > 0) {
-+				Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False);
-+				Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False);
-+
-+				XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32,
-+				                PropModeReplace, (unsigned char *)&pid, 1);
-+				XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8,
-+				                PropModeReplace, hostname, SDL_strlen(hostname));
-+			}
-+		}
-+	}
-+
- 	/* Setup the communication with the IM server */
- 	/* create_aux_windows may be called several times against the same
- 	   Display.  We should reuse the SDL_IM if one has been opened for

-- 
Debian packaging of SDL 1.2