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

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit c49502561c798c231f7d579d1db39d5836224988
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Wed Jun 22 07:30:29 2011 -0400

    Refreshed patches
---
 debian/patches/01_app-defaults.diff      |    9 +++++----
 debian/patches/06_debian_docs.diff       |   10 +++++-----
 debian/patches/07_rgb_location.diff      |    8 ++++----
 debian/patches/12_hyphen_minus_sign.diff |   14 +++++++-------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/patches/01_app-defaults.diff b/debian/patches/01_app-defaults.diff
index dc1a218..604bacc 100644
--- a/debian/patches/01_app-defaults.diff
+++ b/debian/patches/01_app-defaults.diff
@@ -7,9 +7,11 @@ Origin: vendor
 Bug-Debian: http://bugs.debian.org/348697
 Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
 Last-Update: 2011-02-24
---- rxvt-unicode-9.09.orig/src/rxvttoolkit.C
-+++ rxvt-unicode-9.09/src/rxvttoolkit.C
-@@ -323,13 +323,15 @@ rxvt_display::get_resources (bool refres
+Index: pkg-urxvt/src/rxvttoolkit.C
+===================================================================
+--- pkg-urxvt.orig/src/rxvttoolkit.C	2011-06-22 07:29:47.498793478 -0400
++++ pkg-urxvt/src/rxvttoolkit.C	2011-06-22 07:29:50.806809887 -0400
+@@ -326,13 +326,15 @@
    // 6. System wide per application default file.
  
    /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
@@ -30,4 +32,3 @@ Last-Update: 2011-02-24
  
    // 5. User's per application default file.
    // none
-
diff --git a/debian/patches/06_debian_docs.diff b/debian/patches/06_debian_docs.diff
index 6bfd631..7aba6b1 100644
--- a/debian/patches/06_debian_docs.diff
+++ b/debian/patches/06_debian_docs.diff
@@ -5,10 +5,10 @@ Forwarded: no
 Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
 Last-Update: 2011-03-06
 
-Index: rxvt-unicode/doc/rxvt.7.pod
+Index: pkg-urxvt/doc/rxvt.7.pod
 ===================================================================
---- rxvt-unicode.orig/doc/rxvt.7.pod	2011-03-06 19:26:24.547756000 -0500
-+++ rxvt-unicode/doc/rxvt.7.pod	2011-03-06 19:30:10.059756001 -0500
+--- pkg-urxvt.orig/doc/rxvt.7.pod	2011-06-22 07:29:11.082612902 -0400
++++ pkg-urxvt/doc/rxvt.7.pod	2011-06-22 07:29:59.826854614 -0400
 @@ -546,12 +546,9 @@
  
  =head3 My numerical keypad acts weird and generates differing output?
@@ -25,7 +25,7 @@ Index: rxvt-unicode/doc/rxvt.7.pod
  
  =head3 My Compose (Multi_key) key is no longer working.
  
-@@ -923,25 +920,6 @@
+@@ -911,25 +908,6 @@
  
  to your C<.profile> or C<.bashrc>.
  
@@ -51,7 +51,7 @@ Index: rxvt-unicode/doc/rxvt.7.pod
  
  =head2 Encoding / Locale / Input Method Issues
  
-@@ -1100,14 +1078,12 @@
+@@ -1088,14 +1066,12 @@
  
  =head3 I am using Debian GNU/Linux and have a problem...
  
diff --git a/debian/patches/07_rgb_location.diff b/debian/patches/07_rgb_location.diff
index 25826fd..aaba50a 100644
--- a/debian/patches/07_rgb_location.diff
+++ b/debian/patches/07_rgb_location.diff
@@ -6,11 +6,11 @@ Forwarded: no
 Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
 Last-Update: 2011-03-06
 
-Index: rxvt-unicode/doc/rxvt.1.pod
+Index: pkg-urxvt/doc/rxvt.1.pod
 ===================================================================
---- rxvt-unicode.orig/doc/rxvt.1.pod	2011-03-18 18:05:59.485702004 -0400
-+++ rxvt-unicode/doc/rxvt.1.pod	2011-03-18 18:06:07.697702005 -0400
-@@ -1634,7 +1634,7 @@
+--- pkg-urxvt.orig/doc/rxvt.1.pod	2011-06-22 07:29:10.746611233 -0400
++++ pkg-urxvt/doc/rxvt.1.pod	2011-06-22 07:30:03.526872963 -0400
+@@ -1624,7 +1624,7 @@
  
  =over 4
  
diff --git a/debian/patches/12_hyphen_minus_sign.diff b/debian/patches/12_hyphen_minus_sign.diff
index 06ef528..e3a3e02 100644
--- a/debian/patches/12_hyphen_minus_sign.diff
+++ b/debian/patches/12_hyphen_minus_sign.diff
@@ -5,11 +5,11 @@ Origin: vendor
 Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
 Last-Updated: 2011-03-11
 
-Index: rxvt-unicode/doc/rxvt.7.pod
+Index: pkg-urxvt/doc/rxvt.7.pod
 ===================================================================
---- rxvt-unicode.orig/doc/rxvt.7.pod	2011-03-11 10:19:14.900154069 -0500
-+++ rxvt-unicode/doc/rxvt.7.pod	2011-03-11 10:19:30.708154069 -0500
-@@ -1970,7 +1970,7 @@
+--- pkg-urxvt.orig/doc/rxvt.7.pod	2011-06-22 07:30:08.062895455 -0400
++++ pkg-urxvt/doc/rxvt.7.pod	2011-06-22 07:30:09.086900533 -0400
+@@ -1959,7 +1959,7 @@
  
  =begin table
  
@@ -18,10 +18,10 @@ Index: rxvt-unicode/doc/rxvt.7.pod
  	B<< C<l> >>	Font styles have no effect on intensity (Compile styles)
  
  =end table
-Index: rxvt-unicode/doc/rxvtc.1.pod
+Index: pkg-urxvt/doc/rxvtc.1.pod
 ===================================================================
---- rxvt-unicode.orig/doc/rxvtc.1.pod	2011-03-11 10:18:00.016154069 -0500
-+++ rxvt-unicode/doc/rxvtc.1.pod	2011-03-11 10:18:13.704154069 -0500
+--- pkg-urxvt.orig/doc/rxvtc.1.pod	2011-06-22 07:29:07.030592813 -0400
++++ pkg-urxvt/doc/rxvtc.1.pod	2011-06-22 07:30:09.086900533 -0400
 @@ -34,8 +34,8 @@
  
     #!/bin/sh

-- 
Git repository for pkg-urxvt