From 378b39906881fce1bb3ac48ffd039e14f8fe1f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 29 Apr 2017 21:18:13 +0200 Subject: Remove/refresh patches --- debian/changelog | 6 +++ debian/patches/0100-gtk.patch | 108 +++++++++++++++++++++--------------------- debian/patches/series | 6 +-- 3 files changed, 63 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11a4f1a..e4c8e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,12 @@ xtrkcad (1:4.3.0-1) UNRELEASED; urgency=medium [ Jörg Frings-Fürst ] * New upstream release. + - Remove from the upstream applied patches: + + debian/patches/0900-spelling-errors.patch + + debian/patches/0700-info_file.patch + + debian/patches/0705-help_path.patch + - Refresh patches + + debian/patches/0100-gtk.patch * debian/control: - Add Daniel E. Markle as maintainer again. - Add myself as uploader. diff --git a/debian/patches/0100-gtk.patch b/debian/patches/0100-gtk.patch index d2e990f..b37e835 100644 --- a/debian/patches/0100-gtk.patch +++ b/debian/patches/0100-gtk.patch @@ -4,65 +4,65 @@ Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/163/ Last-Update: 2016-12-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/app/wlib/gtklib/gtktext.c -=================================================================== ---- trunk.orig/app/wlib/gtklib/gtktext.c -+++ trunk/app/wlib/gtklib/gtktext.c -@@ -448,7 +448,7 @@ EXPORT wBool_t wTextPrint( - dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -- error->message); -+ "%s", error->message); - - g_error_free (error); - gtk_dialog_run (GTK_DIALOG (dialog)); Index: trunk/app/wlib/gtklib/print.c =================================================================== --- trunk.orig/app/wlib/gtklib/print.c +++ trunk/app/wlib/gtklib/print.c -@@ -120,7 +120,7 @@ WlibApplySettings( GtkPrintOperation *op - dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -- err->message); -+ "%s", err->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } else { -@@ -142,7 +142,7 @@ WlibApplySettings( GtkPrintOperation *op - dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -- err->message); -+ "%s", err->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } else { -@@ -184,7 +184,7 @@ WlibSaveSettings( GtkPrintOperation *op - dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -- err->message); -+ "%s", err->message); +@@ -118,7 +118,7 @@ WlibApplySettings(GtkPrintOperation *op) + dialog = gtk_message_dialog_new(GTK_WINDOW(gtkMainW->gtkwin), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, +- err->message); ++ "%s", err->message); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + } else { +@@ -144,7 +144,7 @@ WlibApplySettings(GtkPrintOperation *op) + dialog = gtk_message_dialog_new(GTK_WINDOW(gtkMainW->gtkwin), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, +- err->message); ++ "%s", err->message); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + } else { +@@ -193,7 +193,7 @@ WlibSaveSettings(GtkPrintOperation *op) + dialog = gtk_message_dialog_new(GTK_WINDOW(gtkMainW->gtkwin), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, +- err->message); ++ "%s", err->message); - g_error_free (err); - gtk_dialog_run (GTK_DIALOG (dialog)); -@@ -202,7 +202,7 @@ WlibSaveSettings( GtkPrintOperation *op - dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -- err->message); -+ "%s", err->message); + g_error_free(err); + gtk_dialog_run(GTK_DIALOG(dialog)); +@@ -216,7 +216,7 @@ WlibSaveSettings(GtkPrintOperation *op) + dialog = gtk_message_dialog_new(GTK_WINDOW(gtkMainW->gtkwin), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, +- err->message); ++ "%s", err->message); - g_error_free (err); - gtk_dialog_run (GTK_DIALOG (dialog)); -@@ -824,7 +824,7 @@ doPrintJobFinished( GtkPrintJob *job, vo - dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, -- err->message); -+ "%s", err->message); - } + g_error_free(err); + gtk_dialog_run(GTK_DIALOG(dialog)); +@@ -900,7 +900,7 @@ doPrintJobFinished(GtkPrintJob *job, voi + dialog = gtk_message_dialog_new(GTK_WINDOW(gtkMainW->gtkwin), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, +- err->message); ++ "%s", err->message); + } } +Index: trunk/app/wlib/gtklib/text.c +=================================================================== +--- trunk.orig/app/wlib/gtklib/text.c ++++ trunk/app/wlib/gtklib/text.c +@@ -360,7 +360,7 @@ wBool_t wTextPrint( + dialog = gtk_message_dialog_new(GTK_WINDOW(gtkMainW->gtkwin), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, +- error->message); ++ "%s", error->message); + g_error_free(error); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); diff --git a/debian/patches/series b/debian/patches/series index aa10a1c..f47597d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -0900-spelling-errors.patch -0700-info_file.patch +#0900-spelling-errors.patch +#0700-info_file.patch 0100-gtk.patch -0705-help_path.patch +#0705-help_path.patch -- cgit v1.2.3