diff -u vinagre-2.27.91/debian/changelog vinagre-2.27.91/debian/changelog --- vinagre-2.27.91/debian/changelog +++ vinagre-2.27.91/debian/changelog @@ -1,3 +1,10 @@ +vinagre (2.27.91-0ubuntu2) karmic; urgency=low + + * Fix Duplicate IDs LP: #422234 + - Added Robert Ancell's patch (Gnome Bug 593361) + + -- Noel J. Bergman Sun, 06 Sep 2009 12:30:01 -0400 + vinagre (2.27.91-0ubuntu1) karmic; urgency=low * New upstream release: (LP: #418949) only in patch2: unchanged: --- vinagre-2.27.91.orig/debian/patches/dup-ids.patch +++ vinagre-2.27.91/debian/patches/dup-ids.patch @@ -0,0 +1,98 @@ +diff --git a/data/vinagre.ui b/data/vinagre.ui +index 33c99ec..93e2560 100644 +--- a/data/vinagre.ui ++++ b/data/vinagre.ui +@@ -17,7 +17,7 @@ + vertical + 2 + +- ++ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 +@@ -61,7 +61,7 @@ + + + +- ++ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 +@@ -101,7 +101,7 @@ + + + +- ++ + True + 0 + _Protocol: +@@ -174,7 +174,7 @@ + + True + +- ++ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + +@@ -540,7 +540,7 @@ + True + vertical + +- ++ + True + + +@@ -688,7 +688,7 @@ + + + +- ++ + True + + +@@ -703,7 +703,7 @@ + + + +- ++ + _Full screen + True + True +@@ -753,7 +753,7 @@ + + True + +- ++ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + +@@ -862,7 +862,7 @@ + + + +- ++ + True + 12 + +diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c +index 71fdbf6..441456f 100644 +--- a/vinagre/vinagre-bookmarks-ui.c ++++ b/vinagre/vinagre-bookmarks-ui.c +@@ -133,7 +133,7 @@ show_dialog_conn (VinagreBookmarks *book, + dialog = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog")); + name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry")); + host_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry")); +- fs_check = GTK_WIDGET (gtk_builder_get_object (xml, "fullscreen_check")); ++ fs_check = GTK_WIDGET (gtk_builder_get_object (xml, "bookmark_fullscreen_check")); + folder_box = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box")); + plugin_box = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_options_vbox")); + save_button = GTK_WIDGET (gtk_builder_get_object (xml, "save_button")); only in patch2: unchanged: --- vinagre-2.27.91.orig/debian/patches/series +++ vinagre-2.27.91/debian/patches/series @@ -0,0 +1 @@ +dup-ids.patch