[SCM] terminatorx/master: Refresh patches.

Sun Apr 1 23:17:13 UTC 2012

The following commit has been merged in the master branch:
commit f8bc6d5d402a4b19b493259f84dd15b01cf256bc
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 2 01:16:59 2012 +0200

    Refresh patches.

diff --git a/debian/patches/05_endian_h.patch b/debian/patches/05_endian_h.patch
index 9de3687..56c202e 100644
--- a/debian/patches/05_endian_h.patch
+++ b/debian/patches/05_endian_h.patch
@@ -1,28 +1,5 @@
-#! /bin/sh -e
-## 05_endian_h.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
+Description: Big-endian compile fixes.
+Author: Mike Furr <mfurr at debian.org>
 ---
  src/tX_endian.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/15_icon_xpm.patch b/debian/patches/15_icon_xpm.patch
index 986ab4e..cbb87cc 100644
--- a/debian/patches/15_icon_xpm.patch
+++ b/debian/patches/15_icon_xpm.patch
@@ -1,28 +1,5 @@
-#! /bin/sh -e
-## 15_icon_xpm.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
+Author: Mike Furr <mfurr at debian.org>
+Description: Provide XPM icon file.
 ---
  gnome-support/terminatorX-app.xpm |  165 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 165 insertions(+)
diff --git a/debian/patches/16_loose_spelling_fix.patch b/debian/patches/16_loose_spelling_fix.patch
index 2f08366..59b8831 100644
--- a/debian/patches/16_loose_spelling_fix.patch
+++ b/debian/patches/16_loose_spelling_fix.patch
@@ -1,17 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_loose_spelling_fix.dpatch by William Grant <william.grant at ubuntu.org.au>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix two instances of 'loose' to 'lose'. (LP: #61952)
-
- at DPATCH@
+Origin: Ubuntu
+Description: Fix two instances of 'loose' to 'lose'.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=389412
+Bug-Ubuntu: https://launchpad.net/bugs/61952
 ---
  src/tX_mastergui.cc |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- terminatorx.orig/src/tX_mastergui.cc
 +++ terminatorx/src/tX_mastergui.cc
-@@ -265,7 +265,7 @@ char tx_mg_current_setname[PATH_MAX]="";
+@@ -273,7 +273,7 @@ char tx_mg_current_setname[PATH_MAX]="";
  GtkSignalFunc new_tables() {
  	GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
  		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
@@ -20,7 +17,7 @@
  	
  	int res=gtk_dialog_run(GTK_DIALOG(dialog));
  	gtk_widget_destroy(dialog);
-@@ -883,7 +883,7 @@ gboolean quit()
+@@ -894,7 +894,7 @@ gboolean quit()
  	if (globals.quit_confirm) {
  		GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
  		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
diff --git a/debian/patches/17_cleanup_desktop_file.patch b/debian/patches/17_cleanup_desktop_file.patch
index 25ef7ca..1d8fd5d 100644
--- a/debian/patches/17_cleanup_desktop_file.patch
+++ b/debian/patches/17_cleanup_desktop_file.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_cleanup_desktop_file.dpatch by William Grant <william.grant at ubuntu.org.au>
-## Remove .png extension from icon filename -- Alessio Treglia <quadrispro at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Clean up .desktop file.
-
- at DPATCH@
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Remove .png extension from icon filename
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564025
 ---
  gnome-support/terminatorX.desktop |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/20_fix_ftbfs_on_kfreebsd.patch b/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
index a97ae60..2c1fe5f 100644
--- a/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
+++ b/debian/patches/20_fix_ftbfs_on_kfreebsd.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_fix_ftbfs_on_kfreebsd by Cyril Brulebois <kibi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS on GNU/kFreeBSD (Closes: #542531).
-
- at DPATCH@
+Author: Cyril Brulebois <kibi at debian.org>
+Description: Fix FTBFS on GNU/kFreeBSD
+Bug-Debian: http://bugs.debian.org/542531
 ---
  src/tX_mouse.cc     |    1 +
  src/tX_seqpar.cc    |    1 +
@@ -16,7 +12,7 @@
 
 --- terminatorx.orig/src/tX_mouse.cc
 +++ terminatorx/src/tX_mouse.cc
-@@ -32,6 +32,7 @@
+@@ -48,6 +48,7 @@
  #include "tX_engine.h"
  #include "tX_vtt.h"
  #include <stdlib.h>
diff --git a/debian/patches/series b/debian/patches/series
index 69ffd79..221560c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
 16_loose_spelling_fix.patch
 17_cleanup_desktop_file.patch
 20_fix_ftbfs_on_kfreebsd.patch
-21_fix_ftbfs_binutils_gold.patch
 22_manual.patch

-- 
terminatorx packaging

