diff -Nru file-roller-3.14.0/debian/changelog file-roller-3.14.0/debian/changelog --- file-roller-3.14.0/debian/changelog 2014-10-04 11:59:16.000000000 +0000 +++ file-roller-3.14.0/debian/changelog 2014-10-17 07:05:06.000000000 +0000 @@ -1,8 +1,15 @@ -file-roller (3.14.0-1~ubuntu14.10.1~ppa1) utopic; urgency=medium +file-roller (3.14.0-1ubuntu1~utopic2) utopic; urgency=medium - * No-change backport to utopic + * Sync with debian, remaining changes: + - Depend on zip and unzip instead of p7zip-full which is in universe + - Suggest p7zip-full (LP: #918107) + - Recommend sessioninstaller + - debian/patches/revert_remove_menubar.patch: Disabled, needs porting + + use a standard menubar like our others softwares (lp: #1131664) + - Run dh-autoreconf + * Drop unar to suggests - -- Vasco Alves Sat, 04 Oct 2014 12:59:16 +0100 + -- Jackson Doak Fri, 17 Oct 2014 06:48:26 +1100 file-roller (3.14.0-1) unstable; urgency=medium @@ -57,6 +64,95 @@ -- Andreas Henriksson Mon, 17 Feb 2014 21:49:42 +0100 +file-roller (3.10.2.1-0ubuntu5) utopic; urgency=medium + + * debian/patches/git_nautilus_extension_unref.patch: + - Stop nautilus crashing due to a missing unref in the file roller + extension (LP: #1333606) + + -- Robert Ancell Fri, 11 Jul 2014 19:35:17 +1200 + +file-roller (3.10.2.1-0ubuntu4) trusty; urgency=medium + + * debian/patches/git_handle_command_line.patch: + - backport fix to allow several instances, it should fix issues where + opening or extracting several archives doesn't work (lp: #1262062) + * debian/patches/git_user_extract_iso.patch: + - let users extract isos without hitting permission errors + (lp: #1264337) + + -- Sebastien Bacher Thu, 27 Feb 2014 17:18:23 +0100 + +file-roller (3.10.2.1-0ubuntu3) trusty; urgency=medium + + * debian/patches/revert_remove_menubar.patch: + - use a standard menubar like our others softwares (lp: #1131664) + + -- Sebastien Bacher Thu, 20 Feb 2014 21:39:47 +0100 + +file-roller (3.10.2.1-0ubuntu2) trusty; urgency=low + + * debian/patches/revert_gtk_3-9.patch: + - drop revert workaround, we have a GTK new enough to build without that + + -- Sebastien Bacher Wed, 11 Dec 2013 16:17:10 +0100 + +file-roller (3.10.2.1-0ubuntu1) trusty; urgency=low + + * New upstream version + - don't segfault in _fr_window_ask_overwrite_dialog (lp: #1228606) + + -- Sebastien Bacher Tue, 12 Nov 2013 12:45:16 +0100 + +file-roller (3.10.1-0ubuntu1) saucy; urgency=low + + * New upstream version, fixes extracting tar archives issues + (lp: #1238266) + + -- Sebastien Bacher Mon, 21 Oct 2013 15:11:31 -0400 + +file-roller (3.10.0-0ubuntu1) saucy; urgency=low + + * New upstream version + * debian/patches/git_correct_attribute_handling.patch: + backport from git, "libarchive: fixed failure when extracting + some tar archives" + + -- Sebastien Bacher Mon, 30 Sep 2013 13:40:09 +0200 + +file-roller (3.9.92-0ubuntu1) saucy; urgency=low + + * New upstream release + - Restore folder modification time correctly (LP: #1166971) + - Ask the password again when wrong password is provided for a zip + - Translation updates + * debian/control.in: + - Build-depend on desktop-file-utils + + -- Jeremy Bicha Tue, 17 Sep 2013 10:18:43 -0400 + +file-roller (3.9.90-0ubuntu1) saucy; urgency=low + + * Sync with Debian. Remaining changes: + - Depend on zip and unzip instead of p7zip which is in universe + - Suggest p7zip-full (LP: #918107) + - Recommend sessioninstaller + * Dropped change: + - Use the Ubuntu epoch for the Nautilus depends (Ubuntu 11.10 + and newer include Nautilus 3.0 or higher) + * New upstream release + - Restore directory modification time when extracting (LP: #1076716) + - Allow viewing the password when creating an encrypted archive + (LP: #772556) + - Avoid unnecessary word break when wrapping text to new lines + (LP: #1193921) + * debian/patches/revert_gtk_3-9.patch: + - Revert commit that requires GTK 3.9 since GTK 3.9 won't be in Saucy + * debian/control.in, debian/rules: + - Run dh-autoreconf for above patch + + -- Jeremy Bicha Mon, 26 Aug 2013 10:16:27 -0400 + file-roller (3.8.4-1) unstable; urgency=low * New upstream release. @@ -1203,4 +1299,3 @@ * Initial Release. -- Bastien Nocera Wed, 19 Dec 2001 17:15:09 +0000 - diff -Nru file-roller-3.14.0/debian/control file-roller-3.14.0/debian/control --- file-roller-3.14.0/debian/control 2014-09-22 21:08:48.000000000 +0000 +++ file-roller-3.14.0/debian/control 2014-10-17 07:05:18.000000000 +0000 @@ -5,11 +5,13 @@ Source: file-roller Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Michael Biebl , Sjoerd Simons +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Sjoerd Simons Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), desktop-file-utils, + dh-autoreconf, gettext, gnome-pkg-tools (>= 0.12), intltool (>= 0.40.0), @@ -30,14 +32,15 @@ Architecture: any Depends: bzip2, nautilus-data (>= 3.0), - p7zip-full, + unzip, + zip, ${misc:Depends}, ${shlibs:Depends} Replaces: gnome-icon-theme (<< 2.14) Recommends: gnome-icon-theme (>= 2.18), gnome-icon-theme-symbolic, gvfs, - unar, + sessioninstaller, yelp Suggests: arj, lha, @@ -45,11 +48,13 @@ lzma, lzop, ncompress, + p7zip-full, rpm2cpio, rzip, sharutils, unace, unalz, + unar, unzip, xz-utils, zip, diff -Nru file-roller-3.14.0/debian/control.in file-roller-3.14.0/debian/control.in --- file-roller-3.14.0/debian/control.in 2014-09-07 12:43:39.000000000 +0000 +++ file-roller-3.14.0/debian/control.in 2014-10-17 07:04:35.000000000 +0000 @@ -1,11 +1,13 @@ Source: file-roller Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), desktop-file-utils, + dh-autoreconf, gettext, gnome-pkg-tools (>= 0.12), intltool (>= 0.40.0), @@ -26,14 +28,15 @@ Architecture: any Depends: bzip2, nautilus-data (>= 3.0), - p7zip-full, + unzip, + zip, ${misc:Depends}, ${shlibs:Depends} Replaces: gnome-icon-theme (<< 2.14) Recommends: gnome-icon-theme (>= 2.18), gnome-icon-theme-symbolic, gvfs, - unar, + sessioninstaller, yelp Suggests: arj, lha, @@ -41,11 +44,13 @@ lzma, lzop, ncompress, + p7zip-full, rpm2cpio, rzip, sharutils, unace, unalz, + unar, unzip, xz-utils, zip, diff -Nru file-roller-3.14.0/debian/patches/revert_remove_menubar.patch file-roller-3.14.0/debian/patches/revert_remove_menubar.patch --- file-roller-3.14.0/debian/patches/revert_remove_menubar.patch 1970-01-01 00:00:00.000000000 +0000 +++ file-roller-3.14.0/debian/patches/revert_remove_menubar.patch 2014-02-25 05:09:24.000000000 +0000 @@ -0,0 +1,334 @@ +Index: file-roller-3.10.2.1/data/org.gnome.FileRoller.gschema.xml.in +=================================================================== +--- file-roller-3.10.2.1.orig/data/org.gnome.FileRoller.gschema.xml.in 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/data/org.gnome.FileRoller.gschema.xml.in 2014-02-20 21:13:59.469348993 +0100 +@@ -110,6 +110,11 @@ + + 200 + ++ ++ true ++ <_summary>View toolbar ++ <_description>Whether to display the toolbar. ++ + + true + <_summary>View statusbar +Index: file-roller-3.10.2.1/src/actions.c +=================================================================== +--- file-roller-3.10.2.1.orig/src/actions.c 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/actions.c 2014-02-20 21:13:59.469348993 +0100 +@@ -386,6 +386,18 @@ + + + void ++activate_action_view_toolbar (GtkAction *action, ++ gpointer data) ++{ ++ GSettings *settings; ++ ++ settings = g_settings_new (FILE_ROLLER_SCHEMA_UI); ++ g_settings_set_boolean (settings, PREF_UI_VIEW_TOOLBAR, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); ++ g_object_unref (settings); ++} ++ ++ ++void + activate_action_view_statusbar (GtkAction *action, + gpointer data) + { +Index: file-roller-3.10.2.1/src/actions.h +=================================================================== +--- file-roller-3.10.2.1.orig/src/actions.h 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/actions.h 2014-02-20 21:13:59.473348994 +0100 +@@ -57,6 +57,7 @@ + void activate_action_open_folder_from_sidebar (GtkAction *action, gpointer data); + void activate_action_password (GtkAction *action, gpointer data); + ++void activate_action_view_toolbar (GtkAction *action, gpointer data); + void activate_action_view_statusbar (GtkAction *action, gpointer data); + void activate_action_view_folders (GtkAction *action, gpointer data); + void activate_action_stop (GtkAction *action, gpointer data); +Index: file-roller-3.10.2.1/src/fr-window.c +=================================================================== +--- file-roller-3.10.2.1.orig/src/fr-window.c 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/fr-window.c 2014-02-20 21:15:52.729352765 +0100 +@@ -5055,6 +5055,7 @@ + { + fr_window_update_current_location (window); + ++ set_active (window, "ViewToolbar", g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_TOOLBAR)); + set_active (window, "ViewStatusbar", g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_STATUSBAR)); + + window->priv->view_folders = g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_FOLDERS); +@@ -5089,6 +5090,17 @@ + + + static void ++pref_view_toolbar_changed (GSettings *settings, ++ const char *key, ++ gpointer user_data) ++{ ++ FrWindow *window = user_data; ++ ++ fr_window_set_toolbar_visibility (window, g_settings_get_boolean (settings, key)); ++} ++ ++ ++static void + pref_view_statusbar_changed (GSettings *settings, + const char *key, + gpointer user_data) +@@ -5385,6 +5397,7 @@ + static void + fr_window_construct (FrWindow *window) + { ++ GtkWidget *menubar; + GtkWidget *toolbar; + GtkWidget *list_scrolled_window; + GtkWidget *location_box; +@@ -5783,6 +5796,10 @@ + g_object_set (other_actions_action, "menu", gtk_ui_manager_get_widget (ui, "/OtherActionsMenu"), NULL); + g_object_unref (other_actions_action); + ++ menubar = gtk_ui_manager_get_widget (ui, "/MenuBar"); ++ fr_window_attach (FR_WINDOW (window), menubar, FR_WINDOW_AREA_MENUBAR); ++ gtk_widget_show (menubar); ++ + window->priv->toolbar = toolbar = gtk_ui_manager_get_widget (ui, "/ToolBar"); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE); + gtk_style_context_add_class (gtk_widget_get_style_context (toolbar), GTK_STYLE_CLASS_PRIMARY_TOOLBAR); +@@ -5841,7 +5858,10 @@ + /**/ + + fr_window_attach (FR_WINDOW (window), window->priv->toolbar, FR_WINDOW_AREA_TOOLBAR); +- gtk_widget_show (toolbar); ++ if (g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_TOOLBAR)) ++ gtk_widget_show (toolbar); ++ else ++ gtk_widget_hide (toolbar); + + window->priv->file_popup_menu = gtk_ui_manager_get_widget (ui, "/FilePopupMenu"); + window->priv->folder_popup_menu = gtk_ui_manager_get_widget (ui, "/FolderPopupMenu"); +@@ -5899,6 +5919,10 @@ + G_CALLBACK (pref_history_len_changed), + window); + g_signal_connect (window->priv->settings_ui, ++ "changed::" PREF_UI_VIEW_TOOLBAR, ++ G_CALLBACK (pref_view_toolbar_changed), ++ window); ++ g_signal_connect (window->priv->settings_ui, + "changed::" PREF_UI_VIEW_STATUSBAR, + G_CALLBACK (pref_view_statusbar_changed), + window); +@@ -9255,6 +9279,21 @@ + } + + ++void ++fr_window_set_toolbar_visibility (FrWindow *window, ++ gboolean visible) ++{ ++ g_return_if_fail (window != NULL); ++ ++ if (visible) ++ gtk_widget_show (window->priv->toolbar); ++ else ++ gtk_widget_hide (window->priv->toolbar); ++ ++ set_active (window, "ViewToolbar", visible); ++} ++ ++ + void + fr_window_set_statusbar_visibility (FrWindow *window, + gboolean visible) +Index: file-roller-3.10.2.1/src/fr-window.h +=================================================================== +--- file-roller-3.10.2.1.orig/src/fr-window.h 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/fr-window.h 2014-02-20 21:13:59.477348994 +0100 +@@ -268,6 +268,8 @@ + GFile *default_dir, + gboolean freeze); + GFile * fr_window_get_extract_default_dir (FrWindow *window); ++void fr_window_set_toolbar_visibility (FrWindow *window, ++ gboolean value); + void fr_window_set_statusbar_visibility (FrWindow *window, + gboolean value); + void fr_window_set_folders_visibility (FrWindow *window, +Index: file-roller-3.10.2.1/src/preferences.h +=================================================================== +--- file-roller-3.10.2.1.orig/src/preferences.h 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/preferences.h 2014-02-20 21:13:59.477348994 +0100 +@@ -49,6 +49,7 @@ + #define PREF_UI_WINDOW_HEIGHT "window-height" + #define PREF_UI_SIDEBAR_WIDTH "sidebar-width" + #define PREF_UI_HISTORY_LEN "history-len" ++#define PREF_UI_VIEW_TOOLBAR "view-toolbar" + #define PREF_UI_VIEW_STATUSBAR "view-statusbar" + #define PREF_UI_VIEW_FOLDERS "view-folders" + +Index: file-roller-3.10.2.1/src/ui/menus-toolbars.ui +=================================================================== +--- file-roller-3.10.2.1.orig/src/ui/menus-toolbars.ui 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/ui/menus-toolbars.ui 2014-02-20 21:13:59.477348994 +0100 +@@ -1,42 +1,48 @@ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -48,16 +54,12 @@ + + + +- + + + + + + +- +- +- + + + +@@ -70,7 +72,6 @@ + + + +- + + + +@@ -82,11 +83,9 @@ + + + +- + + + +- + + + +@@ -98,7 +97,6 @@ + + + +- + + + +Index: file-roller-3.10.2.1/src/ui.h +=================================================================== +--- file-roller-3.10.2.1.orig/src/ui.h 2014-02-20 21:13:59.481348994 +0100 ++++ file-roller-3.10.2.1/src/ui.h 2014-02-20 21:13:59.477348994 +0100 +@@ -28,6 +28,11 @@ + + + static GtkActionEntry action_entries[] = { ++ { "FileMenu", NULL, N_("_Archive") }, ++ { "EditMenu", NULL, N_("_Edit") }, ++ { "ViewMenu", NULL, N_("_View") }, ++ { "HelpMenu", NULL, N_("_Help") }, ++ { "ArrangeFilesMenu", NULL, N_("_Arrange Files") }, + { "OtherActionsMenu", NULL, NULL }, + + { "About", GTK_STOCK_ABOUT, +@@ -188,6 +193,11 @@ + + + static GtkToggleActionEntry action_toggle_entries[] = { ++ { "ViewToolbar", NULL, ++ N_("_Toolbar"), NULL, ++ N_("View the main toolbar"), ++ G_CALLBACK (activate_action_view_toolbar), ++ TRUE }, + { "ViewStatusbar", NULL, + N_("Stat_usbar"), NULL, + N_("View the statusbar"), diff -Nru file-roller-3.14.0/debian/patches/series file-roller-3.14.0/debian/patches/series --- file-roller-3.14.0/debian/patches/series 2014-05-16 17:16:45.000000000 +0000 +++ file-roller-3.14.0/debian/patches/series 2014-10-16 19:51:48.000000000 +0000 @@ -1,2 +1,3 @@ 01_package_names.patch 99_ltmain_as-needed.patch +#revert_remove_menubar.patch diff -Nru file-roller-3.14.0/debian/rules file-roller-3.14.0/debian/rules --- file-roller-3.14.0/debian/rules 2012-11-24 23:43:06.000000000 +0000 +++ file-roller-3.14.0/debian/rules 2014-10-16 19:52:13.000000000 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk