Source: deja-dup Followup-For: Bug #787881 Dear Maintainer,
Please apply the attached patch to fix this ftbfs. Regards, Rodolphe -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
>From b40c191d76b13d68ae43407f41fdeb1cceb6fff8 Mon Sep 17 00:00:00 2001 From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> Date: Sun, 7 Jun 2015 20:54:53 +0200 Subject: [PATCH] Replace deprecated xalign properties by halign. Closes: #787881 --- ...ce-deprecated-xalign-properties-by-halign.patch | 245 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 246 insertions(+) create mode 100644 debian/patches/0001-Replace-deprecated-xalign-properties-by-halign.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-Replace-deprecated-xalign-properties-by-halign.patch b/debian/patches/0001-Replace-deprecated-xalign-properties-by-halign.patch new file mode 100644 index 0000000..9694520 --- /dev/null +++ b/debian/patches/0001-Replace-deprecated-xalign-properties-by-halign.patch @@ -0,0 +1,245 @@ +From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> +Date: Sun, 7 Jun 2015 20:50:57 +0200 +Subject: Replace deprecated xalign properties by halign. + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=787881 +--- + deja-dup/Assistant.vala | 2 +- + deja-dup/AssistantOperation.vala | 20 ++++++++++---------- + deja-dup/MountOperationAssistant.vala | 10 +++++----- + deja-dup/preferences/Preferences.vala | 8 ++++---- + deja-dup/widgets/ConfigLabel.vala | 2 +- + deja-dup/widgets/ConfigLabelLocation.vala | 2 +- + deja-dup/widgets/ConfigLocationTable.vala | 2 +- + 7 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/deja-dup/Assistant.vala b/deja-dup/Assistant.vala +index a6055c8..e63d828 100644 +--- a/deja-dup/Assistant.vala ++++ b/deja-dup/Assistant.vala +@@ -83,7 +83,7 @@ public abstract class Assistant : Gtk.Window + var ehbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0); + header_title = new Gtk.Label(""); + header_title.name = "header"; +- header_title.xalign = 0f; ++ header_title.halign = Gtk.Align.START; + header_icon = new Gtk.Image(); + ehbox.border_width = 6; + ehbox.pack_start(header_title, true, true, 0); +diff --git a/deja-dup/AssistantOperation.vala b/deja-dup/AssistantOperation.vala +index ed1546f..25fa5cc 100644 +--- a/deja-dup/AssistantOperation.vala ++++ b/deja-dup/AssistantOperation.vala +@@ -224,10 +224,10 @@ public abstract class AssistantOperation : Assistant + int row = 0; + + progress_label = new Gtk.Label(""); +- progress_label.xalign = 0.0f; ++ progress_label.halign = Gtk.Align.START; + + progress_file_label = new Gtk.Label(""); +- progress_file_label.xalign = 0.0f; ++ progress_file_label.halign = Gtk.Align.START; + progress_file_label.ellipsize = Pango.EllipsizeMode.MIDDLE; + progress_file_label.hexpand = true; + +@@ -236,7 +236,7 @@ public abstract class AssistantOperation : Assistant + ++row; + + secondary_label = new Gtk.Label(""); +- secondary_label.xalign = 0.0f; ++ secondary_label.halign = Gtk.Align.START; + secondary_label.wrap = true; + secondary_label.max_width_chars = 30; + secondary_label.no_show_all = true; +@@ -322,7 +322,7 @@ public abstract class AssistantOperation : Assistant + + w = new Gtk.Label("<i>%s</i>".printf( + _("You will need your password to restore your files. You might want to write it down."))); +- w.set("xalign", 0.0f, ++ w.set("halign", Gtk.Align.START, + "use-markup", true, + "max-width-chars", 25, + "wrap", true); +@@ -339,7 +339,7 @@ public abstract class AssistantOperation : Assistant + label = new Gtk.Label(_("E_ncryption password")); + label.set("mnemonic-widget", w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + page.attach(label, 1, rows, 1, 1); + page.attach(w, 2, rows, 1, 1); + encrypt_enabled.bind_property("active", w, "sensitive", BindingFlags.SYNC_CREATE); +@@ -356,7 +356,7 @@ public abstract class AssistantOperation : Assistant + label = new Gtk.Label(_("Confir_m password")); + label.set("mnemonic-widget", w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + page.attach(label, 1, rows, 1, 1); + page.attach(w, 2, rows, 1, 1); + encrypt_enabled.bind_property("active", w, "sensitive", BindingFlags.SYNC_CREATE); +@@ -393,7 +393,7 @@ public abstract class AssistantOperation : Assistant + "border-width", 12); + + w = new Gtk.Label(_("In order to check that you will be able to retrieve your files in the case of an emergency, please enter your encryption password again to perform a brief restore test.")); +- w.set("xalign", 0.0f, ++ w.set("halign", Gtk.Align.START, + "max-width-chars", 25, + "wrap", true); + page.attach(w, 0, rows, 3, 1); +@@ -408,7 +408,7 @@ public abstract class AssistantOperation : Assistant + label = new Gtk.Label(_("E_ncryption password")); + label.set("mnemonic-widget", w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + page.attach(label, 1, rows, 1, 1); + page.attach(w, 2, rows, 1, 1); + nag_entry = w as Gtk.Entry; +@@ -447,7 +447,7 @@ public abstract class AssistantOperation : Assistant + "wrap", true, + "max-width-chars", 25, + "hexpand", true, +- "xalign", 0.0f); ++ "halign", Gtk.Align.START); + page.attach(label, 0, rows, 1, 1); + ++rows; + question_label = label; +@@ -458,7 +458,7 @@ public abstract class AssistantOperation : Assistant + protected virtual Gtk.Widget make_summary_page() + { + summary_label = new Gtk.Label(""); +- summary_label.set("xalign", 0.0f); ++ summary_label.set("halign", Gtk.Align.START); + summary_label.wrap = true; + summary_label.max_width_chars = 25; + +diff --git a/deja-dup/MountOperationAssistant.vala b/deja-dup/MountOperationAssistant.vala +index 1194587..a48c5ce 100644 +--- a/deja-dup/MountOperationAssistant.vala ++++ b/deja-dup/MountOperationAssistant.vala +@@ -137,7 +137,7 @@ public class MountOperationAssistant : MountOperation + assist.set_page_title(password_page, label_title); + + label = new Gtk.Label(message); +- label.xalign = 0.0f; ++ label.halign = Gtk.Align.START; + label.wrap = true; + label.max_width_chars = 25; + layout.pack_start(label, false, false, 0); +@@ -146,7 +146,7 @@ public class MountOperationAssistant : MountOperation + label = new Gtk.Label(label_help); + label.use_markup = true; + label.track_visited_links = false; +- label.set("xalign", 0f); ++ label.set("halign", Gtk.Align.START); + layout.pack_start(label, false, false, 0); + } + +@@ -195,7 +195,7 @@ public class MountOperationAssistant : MountOperation + label = new Gtk.Label(label_username); + label.set("mnemonic-widget", username_w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + table.attach(label, ucol, rows, 1, 1); + table.attach(username_w, ucol+1, rows, 2-ucol, 1); + ++rows; +@@ -213,7 +213,7 @@ public class MountOperationAssistant : MountOperation + label = new Gtk.Label(_("_Domain")); + label.set("mnemonic-widget", domain_w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + table.attach(label, ucol, rows, 1, 1); + table.attach(domain_w, ucol+1, rows, 2-ucol, 1); + ++rows; +@@ -229,7 +229,7 @@ public class MountOperationAssistant : MountOperation + label = new Gtk.Label(label_password); + label.set("mnemonic-widget", password_w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + table.attach(label, ucol, rows, 1, 1); + table.attach(password_w, ucol+1, rows, 2-ucol, 1); + ++rows; +diff --git a/deja-dup/preferences/Preferences.vala b/deja-dup/preferences/Preferences.vala +index 89016d2..017e663 100644 +--- a/deja-dup/preferences/Preferences.vala ++++ b/deja-dup/preferences/Preferences.vala +@@ -213,7 +213,7 @@ public class Preferences : Gtk.Grid + label = new Gtk.Label(_("_Storage location")); + label.set("mnemonic-widget", location, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + label_sizes.add_widget(label); + + table.attach(label, 0, row, 1, 1); +@@ -254,7 +254,7 @@ public class Preferences : Gtk.Grid + align.add(@switch); + label = new Gtk.Label.with_mnemonic(_("_Automatic backup")); + label.mnemonic_widget = @switch; +- label.xalign = 1.0f; ++ label.halign = Gtk.Align.END; + table.attach(label, 0, row, 1, 1); + table.attach(align, 1, row, 1, 1); + ++row; +@@ -266,7 +266,7 @@ public class Preferences : Gtk.Grid + // translators: as in "Every day" + label = new Gtk.Label.with_mnemonic(_("_Every")); + label.mnemonic_widget = w; +- label.xalign = 1.0f; ++ label.halign = Gtk.Align.END; + settings.bind(DejaDup.PERIODIC_KEY, label, "sensitive", SettingsBindFlags.GET); + table.attach(label, 0, row, 1, 1); + table.attach(w, 1, row, 1, 1); +@@ -276,7 +276,7 @@ public class Preferences : Gtk.Grid + w.hexpand = true; + label = new Gtk.Label.with_mnemonic(C_("verb", "_Keep")); + label.mnemonic_widget = w; +- label.xalign = 1.0f; ++ label.halign = Gtk.Align.END; + table.attach(label, 0, row, 1, 1); + table.attach(w, 1, row, 1, 1); + ++row; +diff --git a/deja-dup/widgets/ConfigLabel.vala b/deja-dup/widgets/ConfigLabel.vala +index 9269777..d1fedf8 100644 +--- a/deja-dup/widgets/ConfigLabel.vala ++++ b/deja-dup/widgets/ConfigLabel.vala +@@ -41,7 +41,7 @@ public class ConfigLabel : ConfigWidget + + protected virtual void fill_box() + { +- label.xalign = 0.0f; ++ label.halign = Gtk.Align.START; + label.hexpand = true; + box.add(label); + } +diff --git a/deja-dup/widgets/ConfigLabelLocation.vala b/deja-dup/widgets/ConfigLabelLocation.vala +index d279c34..ec29005 100644 +--- a/deja-dup/widgets/ConfigLabelLocation.vala ++++ b/deja-dup/widgets/ConfigLabelLocation.vala +@@ -53,7 +53,7 @@ public class ConfigLabelLocation : ConfigLabel + img.expand = false; + box.add(img); + +- label.xalign = 0.0f; ++ label.halign = Gtk.Align.START; + label.ellipsize = Pango.EllipsizeMode.MIDDLE; + box.add(label); + } +diff --git a/deja-dup/widgets/ConfigLocationTable.vala b/deja-dup/widgets/ConfigLocationTable.vala +index a6def98..8330235 100644 +--- a/deja-dup/widgets/ConfigLocationTable.vala ++++ b/deja-dup/widgets/ConfigLocationTable.vala +@@ -42,7 +42,7 @@ public class ConfigLocationTable : Gtk.Grid + var label = new Gtk.Label(msg); + label.set("mnemonic-widget", (mnemonic != null) ? mnemonic : w, + "use-underline", true, +- "xalign", 1.0f); ++ "halign", Gtk.Align.END); + label_sizes.add_widget(label); + add_widget_with_label(label, w, check); + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b5cfb30 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Replace-deprecated-xalign-properties-by-halign.patch -- 2.1.4
