r47534 - in /desktop/experimental/eog/debian: changelog control control.in patches/0002-Show-traditional-title-bar-in-unity.patch patches/series
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Tue Mar 15 20:54:10 UTC 2016
Author: ah
Date: Tue Mar 15 20:54:10 2016
New Revision: 47534
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47534
Log:
* New upstream release.
* Bump build-dependencies according to configure.ac changes:
- libgtk-3-dev (>= 3.19.3)
- libglib2.0-dev (>= 2.42.0)
* Bump Standards-Version to 3.9.7.
* Temporarily disable patch which no longer applies:
- debian/patches/0001-Add-a-traditional-menu-bar.patch
- debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch
* Update patch to apply:
- debian/patches/0002-Show-traditional-title-bar-in-unity.patch
Modified:
desktop/experimental/eog/debian/changelog
desktop/experimental/eog/debian/control
desktop/experimental/eog/debian/control.in
desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch
desktop/experimental/eog/debian/patches/series
Modified: desktop/experimental/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/changelog?rev=47534&op=diff
==============================================================================
--- desktop/experimental/eog/debian/changelog [utf-8] (original)
+++ desktop/experimental/eog/debian/changelog [utf-8] Tue Mar 15 20:54:10 2016
@@ -1,3 +1,18 @@
+eog (3.19.92-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump build-dependencies according to configure.ac changes:
+ - libgtk-3-dev (>= 3.19.3)
+ - libglib2.0-dev (>= 2.42.0)
+ * Bump Standards-Version to 3.9.7.
+ * Temporarily disable patch which no longer applies:
+ - debian/patches/0001-Add-a-traditional-menu-bar.patch
+ - debian/patches/Put-Exit-Fullscreen-button-into-toolbar.patch
+ * Update patch to apply:
+ - debian/patches/0002-Show-traditional-title-bar-in-unity.patch
+
+ -- Andreas Henriksson <andreas at fatal.se> Tue, 15 Mar 2016 21:35:19 +0100
+
eog (3.18.2-1) unstable; urgency=medium
* New upstrem release.
Modified: desktop/experimental/eog/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/control?rev=47534&op=diff
==============================================================================
--- desktop/experimental/eog/debian/control [utf-8] (original)
+++ desktop/experimental/eog/debian/control [utf-8] Tue Mar 15 20:54:10 2016
@@ -6,8 +6,8 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Standards-Version: 3.9.6
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Standards-Version: 3.9.7
Homepage: https://wiki.gnome.org/Apps/EyeOfGnome
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 8),
@@ -16,9 +16,9 @@
gtk-doc-tools (>= 1.16),
intltool (>= 0.40.0),
pkg-config,
- libgtk-3-dev (>= 3.14.0),
+ libgtk-3-dev (>= 3.19.3),
libgdk-pixbuf2.0-dev (>= 2.30.0),
- libglib2.0-dev (>= 2.38.0),
+ libglib2.0-dev (>= 2.42.0),
libgnome-desktop-3-dev (>= 2.91.2),
shared-mime-info (>= 0.20),
gsettings-desktop-schemas-dev (>= 2.91.92),
Modified: desktop/experimental/eog/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/control.in?rev=47534&op=diff
==============================================================================
--- desktop/experimental/eog/debian/control.in [utf-8] (original)
+++ desktop/experimental/eog/debian/control.in [utf-8] Tue Mar 15 20:54:10 2016
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: https://wiki.gnome.org/Apps/EyeOfGnome
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 8),
@@ -12,9 +12,9 @@
gtk-doc-tools (>= 1.16),
intltool (>= 0.40.0),
pkg-config,
- libgtk-3-dev (>= 3.14.0),
+ libgtk-3-dev (>= 3.19.3),
libgdk-pixbuf2.0-dev (>= 2.30.0),
- libglib2.0-dev (>= 2.38.0),
+ libglib2.0-dev (>= 2.42.0),
libgnome-desktop-3-dev (>= 2.91.2),
shared-mime-info (>= 0.20),
gsettings-desktop-schemas-dev (>= 2.91.92),
Modified: desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch?rev=47534&op=diff
==============================================================================
--- desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch [utf-8] (original)
+++ desktop/experimental/eog/debian/patches/0002-Show-traditional-title-bar-in-unity.patch [utf-8] Tue Mar 15 20:54:10 2016
@@ -8,11 +8,9 @@
src/eog-window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 55 insertions(+), 11 deletions(-)
-Index: eog-3.18.0/src/eog-window.c
-===================================================================
---- eog-3.18.0.orig/src/eog-window.c
-+++ eog-3.18.0/src/eog-window.c
-@@ -134,6 +134,7 @@ struct _EogWindowPrivate {
+--- a/src/eog-window.c
++++ b/src/eog-window.c
+@@ -134,6 +134,7 @@
GtkWidget *zoom_revealer;
GtkWidget *zoom_scale;
GtkWidget *properties_dlg;
@@ -20,11 +18,11 @@
GMenu *open_with_menu;
GPtrArray *appinfo;
-@@ -4257,6 +4258,43 @@ eog_window_zoom_button_toggled_cb (GtkTo
+@@ -4259,6 +4260,43 @@
gtk_button_set_image (GTK_BUTTON (button), zoom_image);
}
-+static gboolean
++/*static gboolean
+in_desktop (const gchar *name)
+{
+ const gchar *desktop_name_list;
@@ -45,7 +43,7 @@
+ g_strfreev (names);
+
+ return in_list;
-+}
++}*/
+
+static void
+on_action_state_changed (GActionGroup *action_group,
@@ -64,7 +62,7 @@
static void
eog_window_construct_ui (EogWindow *window)
{
-@@ -4268,7 +4306,6 @@ eog_window_construct_ui (EogWindow *wind
+@@ -4270,7 +4308,6 @@
GtkWidget *popup_menu;
GtkWidget *hpaned;
@@ -72,7 +70,7 @@
GtkWidget *zoom_button;
GtkWidget *zoom_image;
GtkWidget *menu_button;
-@@ -4283,12 +4320,19 @@ eog_window_construct_ui (EogWindow *wind
+@@ -4285,12 +4322,19 @@
gtk_container_add (GTK_CONTAINER (window), priv->box);
gtk_widget_show (priv->box);
@@ -98,7 +96,7 @@
zoom_button = gtk_toggle_button_new ();
zoom_image = gtk_image_new_from_icon_name ("zoom-in-symbolic",
-@@ -4299,7 +4343,7 @@ eog_window_construct_ui (EogWindow *wind
+@@ -4301,7 +4345,7 @@
g_signal_connect (zoom_button, "toggled",
G_CALLBACK (eog_window_zoom_button_toggled_cb),
window);
@@ -107,7 +105,7 @@
/* disable zoom button if no image is loaded */
g_object_bind_property (g_action_map_lookup_action (G_ACTION_MAP(window),
"zoom-normal"),
-@@ -4310,7 +4354,7 @@ eog_window_construct_ui (EogWindow *wind
+@@ -4312,7 +4356,7 @@
priv->zoom_revealer = gtk_revealer_new ();
gtk_revealer_set_transition_type (GTK_REVEALER (priv->zoom_revealer),
GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
@@ -116,16 +114,16 @@
priv->zoom_revealer);
gtk_widget_show (priv->zoom_revealer);
-@@ -4344,7 +4388,7 @@ eog_window_construct_ui (EogWindow *wind
- gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
- G_MENU_MODEL (builder_object));
+@@ -4342,7 +4386,7 @@
+ gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
+ G_MENU_MODEL (builder_object));
-- gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
-+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), menu_button);
- gtk_widget_show (menu_button);
+- gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
++ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), menu_button);
+ gtk_widget_show (menu_button);
- builder_object = gtk_builder_get_object (builder, "open-with-menu");
-@@ -4361,7 +4405,7 @@ eog_window_construct_ui (EogWindow *wind
+ action = G_ACTION (g_property_action_new ("toggle-gear-menu",
+@@ -4356,7 +4400,7 @@
"win.view-fullscreen");
gtk_widget_set_tooltip_text(fullscreen_button,
_("Show the current image in fullscreen mode"));
@@ -133,4 +131,4 @@
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), fullscreen_button);
gtk_widget_show (fullscreen_button);
- priv->cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ priv->open_with_menu = g_menu_new ();
Modified: desktop/experimental/eog/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/series?rev=47534&op=diff
==============================================================================
--- desktop/experimental/eog/debian/patches/series [utf-8] (original)
+++ desktop/experimental/eog/debian/patches/series [utf-8] Tue Mar 15 20:54:10 2016
@@ -1,3 +1,3 @@
-0001-Add-a-traditional-menu-bar.patch
+#0001-Add-a-traditional-menu-bar.patch
0002-Show-traditional-title-bar-in-unity.patch
-Put-Exit-Fullscreen-button-into-toolbar.patch
+#Put-Exit-Fullscreen-button-into-toolbar.patch
More information about the pkg-gnome-commits
mailing list