[SCM] terminatorx/master: Drop 16_loose_spelling_fix.patch, fixed upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Mar 7 17:41:19 UTC 2014


The following commit has been merged in the master branch:
commit 498173de7ff70eabd13f6dc1fc18944da2937b6a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Mar 7 17:38:08 2014 +0000

    Drop 16_loose_spelling_fix.patch, fixed upstream.

diff --git a/debian/patches/16_loose_spelling_fix.patch b/debian/patches/16_loose_spelling_fix.patch
deleted file mode 100644
index 59b8831..0000000
--- a/debian/patches/16_loose_spelling_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-@@ -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,
--		"Are you sure you want to loose all turntables and events?");
-+		"Are you sure you want to lose all turntables and events?");
- 	
- 	int res=gtk_dialog_run(GTK_DIALOG(dialog));
- 	gtk_widget_destroy(dialog);
-@@ -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,
--		"Exit terminatorX and loose all unsaved data?");
-+		"Exit terminatorX and lose all unsaved data?");
- 		
- 		int res=gtk_dialog_run(GTK_DIALOG(dialog));
- 		gtk_widget_destroy(dialog);
diff --git a/debian/patches/series b/debian/patches/series
index 0fb309a..72e60a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 15_icon_xpm.patch
-16_loose_spelling_fix.patch
 17_cleanup_desktop_file.patch
 20_fix_ftbfs_on_kfreebsd.patch
 22_manual.patch

-- 
terminatorx packaging



More information about the pkg-multimedia-commits mailing list