[Pkg-urxvt-maintainers] [SCM] Git repository for pkg-urxvt branch, master, updated. debian/9.10-2-7-g22ff64a

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit ab3877e54d23d0802debcda9aa7b729d552122e7
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Mon May 2 09:37:15 2011 -0400

    Drop 13_screenoverlay_shortcut_clash.diff, applied upstream
    
    This reverts commit 29a01c8c790aeaf4e6b7e57ef8b897074d1de813.
    
    Conflicts:
    
    	debian/patches/series
---
 .../patches/13_screenoverlay_shortcut_clash.diff   |   25 --------------------
 debian/patches/series                              |    1 -
 2 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/debian/patches/13_screenoverlay_shortcut_clash.diff b/debian/patches/13_screenoverlay_shortcut_clash.diff
deleted file mode 100644
index 55013f7..0000000
--- a/debian/patches/13_screenoverlay_shortcut_clash.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Description: Don't have C-M-X shortcuts make urxvt crash when X is accessed
- through a shift key.
- .
- Commited upstream, this patch is to be dropped with 9.11-1.
-Author: Emanuele Giaquinta
-Origin: upstream
-Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Updated: 2011-04-01
-
-Index: rxvt-unicode/src/screen.C
-===================================================================
---- rxvt-unicode.orig/src/screen.C	2011-02-23 14:52:53.000000000 -0500
-+++ rxvt-unicode/src/screen.C	2011-04-01 08:20:36.905279657 -0400
-@@ -163,6 +163,10 @@
- void
- rxvt_term::scr_reset ()
- {
-+#if ENABLE_OVERLAY
-+  scr_overlay_off ();
-+#endif
-+
-   view_start = 0;
-   num_scr = 0;
- 
diff --git a/debian/patches/series b/debian/patches/series
index fa84518..70f21fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@
 08_rebuild_docs.diff
 11_fix_lexgrog.diff
 12_hyphen_minus_sign.diff
-13_screenoverlay_shortcut_clash.diff
 14_path_max.diff

-- 
Git repository for pkg-urxvt