diff -Nru gpaste-3.14/debian/changelog gpaste-3.14.4.1/debian/changelog --- gpaste-3.14/debian/changelog 2015-03-16 19:03:31.000000000 +1100 +++ gpaste-3.14.4.1/debian/changelog 2015-06-02 06:53:37.000000000 +1000 @@ -1,3 +1,16 @@ +gpaste (3.14.4.1-1ubuntu1) wily; urgency=low + + * Merge from Debian unstable. LP: #1439685 Remaining changes: + - Change appdata-tools b-dep to appstream-util + + -- Jackson Doak Tue, 02 Jun 2015 06:53:29 +1000 + +gpaste (3.14.4.1-1) unstable; urgency=medium + + * Build libgpaste2-dbg package (Closes: #773945). + + -- Jérémy Lal Mon, 25 May 2015 19:59:42 +0200 + gpaste (3.14-2ubuntu1) vivid; urgency=medium * Merge from debian. Remaining changes: @@ -61,3 +74,4 @@ Leo Iannacone . -- Jérémy Lal Tue, 29 Jul 2014 14:12:23 +0200 + diff -Nru gpaste-3.14/debian/control gpaste-3.14.4.1/debian/control --- gpaste-3.14/debian/control 2015-03-16 19:03:24.000000000 +1100 +++ gpaste-3.14.4.1/debian/control 2015-05-27 03:34:58.000000000 +1000 @@ -71,6 +71,19 @@ This package contains headers and libraries for developing applications that use GPaste to manage the clipboard. +Package: libgpaste2-dbg +Priority: extra +Section: debug +Architecture: any +Depends: ${misc:Depends}, + libgpaste2 (= ${binary:Version}) +Description: Clipboard management system for GNOME - debugging symbols + GPaste manages clipboard history and allows easy access to it using + keyboard shortcuts, gnome-shell extension, command-line tools, gir + bindings. + . + This package provides the debugging symbols for the library. + Package: gir1.2-gpaste-2.0 Section: introspection Architecture: any diff -Nru gpaste-3.14/debian/libgpaste2.symbols gpaste-3.14.4.1/debian/libgpaste2.symbols --- gpaste-3.14/debian/libgpaste2.symbols 2015-03-16 19:03:24.000000000 +1100 +++ gpaste-3.14.4.1/debian/libgpaste2.symbols 2015-05-27 03:34:58.000000000 +1000 @@ -107,6 +107,9 @@ g_paste_client_rename_password@LIBGPASTE_1 3.12.2 g_paste_client_rename_password_finish@LIBGPASTE_1 3.12.2 g_paste_client_rename_password_sync@LIBGPASTE_1 3.12.2 + g_paste_client_search@LIBGPASTE_2 3.14.3 + g_paste_client_search_finish@LIBGPASTE_2 3.14.3 + g_paste_client_search_sync@LIBGPASTE_2 3.14.3 g_paste_client_select@LIBGPASTE_1 3.12.2 g_paste_client_select_finish@LIBGPASTE_1 3.12.2 g_paste_client_select_sync@LIBGPASTE_1 3.12.2 @@ -122,6 +125,7 @@ g_paste_client_track@LIBGPASTE_1 3.12.2 g_paste_client_track_finish@LIBGPASTE_1 3.12.2 g_paste_client_track_sync@LIBGPASTE_1 3.12.2 + g_paste_clipboard_bootstrap@LIBGPASTE_2 3.14.3 g_paste_clipboard_get_image_checksum@LIBGPASTE_1 3.12.2 g_paste_clipboard_get_real@LIBGPASTE_1 3.12.2 g_paste_clipboard_get_target@LIBGPASTE_1 3.12.2 @@ -142,17 +146,6 @@ g_paste_daemon_new@LIBGPASTE_1 3.12.2 g_paste_daemon_own_bus_name@LIBGPASTE_1 3.12.2 g_paste_daemon_show_history@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_eval@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_eval_finish@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_eval_sync@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_focus_app@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_focus_app_finish@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_focus_app_sync@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_focus_search@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_focus_search_finish@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_focus_search_sync@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_get_mode@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_get_shell_version@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_get_type@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_grab_accelerator@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_grab_accelerator_finish@LIBGPASTE_1 3.12.2 @@ -163,14 +156,6 @@ g_paste_gnome_shell_client_new@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_new_finish@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_new_sync@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_overview_is_active@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_overview_set_active@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_show_applications@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_show_applications_finish@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_show_applications_sync@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_show_osd@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_show_osd_finish@LIBGPASTE_1 3.12.2 - g_paste_gnome_shell_client_show_osd_sync@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_ungrab_accelerator@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_ungrab_accelerator_finish@LIBGPASTE_1 3.12.2 g_paste_gnome_shell_client_ungrab_accelerator_sync@LIBGPASTE_1 3.12.2 @@ -192,6 +177,7 @@ g_paste_history_remove@LIBGPASTE_1 3.12.2 g_paste_history_rename_password@LIBGPASTE_1 3.12.2 g_paste_history_save@LIBGPASTE_1 3.12.2 + g_paste_history_search@LIBGPASTE_2 3.14.3 g_paste_history_select@LIBGPASTE_1 3.12.2 g_paste_history_set_password@LIBGPASTE_1 3.12.2 g_paste_history_switch@LIBGPASTE_1 3.12.2 @@ -232,6 +218,10 @@ g_paste_password_item_set_name@LIBGPASTE_1 3.12.2 g_paste_pop_keybinding_get_type@LIBGPASTE_1 3.12.2 g_paste_pop_keybinding_new@LIBGPASTE_1 3.12.2 + g_paste_screensaver_client_get_type@LIBGPASTE_2 3.14.3 + g_paste_screensaver_client_new@LIBGPASTE_2 3.14.3 + g_paste_screensaver_client_new_finish@LIBGPASTE_2 3.14.3 + g_paste_screensaver_client_new_sync@LIBGPASTE_2 3.14.3 g_paste_settings_get_element_size@LIBGPASTE_1 3.12.2 g_paste_settings_get_extension_enabled@LIBGPASTE_1 3.12.2 g_paste_settings_get_growing_lines@LIBGPASTE_1 3.12.2 diff -Nru gpaste-3.14/debian/patches/series gpaste-3.14.4.1/debian/patches/series --- gpaste-3.14/debian/patches/series 2015-03-16 19:03:31.000000000 +1100 +++ gpaste-3.14.4.1/debian/patches/series 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -upstream-fix-crashes-0e899af5.patch diff -Nru gpaste-3.14/debian/patches/upstream-fix-crashes-0e899af5.patch gpaste-3.14.4.1/debian/patches/upstream-fix-crashes-0e899af5.patch --- gpaste-3.14/debian/patches/upstream-fix-crashes-0e899af5.patch 2015-03-16 19:03:31.000000000 +1100 +++ gpaste-3.14.4.1/debian/patches/upstream-fix-crashes-0e899af5.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,83 +0,0 @@ -From: Marc-Antoine Perennou -Last-Update: 2015-03-07 -Description: gnome-shell: fix weird gjs gsignal bug -Origin: https://github.com/Keruspe/GPaste/commit/0e899af538631026c6cd739986ea854f79b91c95 -Bug: https://github.com/Keruspe/GPaste/issues/106 -Reviewed-By: Jérémy Lal - ---- a/src/gnome-shell/indicator.js -+++ b/src/gnome-shell/indicator.js -@@ -86,8 +86,9 @@ - this._dummyHistoryItem.update(); - this._prefsItem = new PrefsItem.GPastePrefsItem(this.menu); - this._emptyHistoryItem = new EmptyHistoryItem.GPasteEmptyHistoryItem(this._client); -+ this._switch = new StateSwitch.GPasteStateSwitch(this._client); - -- this._addToHeader(new StateSwitch.GPasteStateSwitch(this._client)); -+ this._addToHeader(this._switch); - this._addToHeader(this._searchItem); - this._actions.actor.add(this._prefsItem, { expand: true, x_fill: false }); - this._actions.actor.add(this._emptyHistoryItem, { expand: true, x_fill: false }); -@@ -97,6 +98,7 @@ - this._refresh(0); - - this._clientShowId = this._client.connect('show-history', Lang.bind(this, this._popup)); -+ this._clientTrackingId = this._client.connect('tracking', Lang.bind(this, this._toggle)); - - this._onStateChanged (true); - -@@ -239,6 +241,10 @@ - this._selectSearch(true); - }, - -+ _toggle: function(c, state) { -+ this._switch.toggle(state); -+ }, -+ - _selectSearch: function(active) { - if (this._history.length > 0) { - this._searchItem.setActive(active); -@@ -281,6 +287,7 @@ - _onDestroy: function() { - this._client.disconnect(this._clientUpdateId); - this._client.disconnect(this._clientShowId); -+ this._client.disconnect(this._clientTrackingId); - this._settings.disconnect(this._settingsMaxSizeChangedId); - this._settings.disconnect(this._settingsSizeChangedId); - } ---- a/src/gnome-shell/stateSwitch.js -+++ b/src/gnome-shell/stateSwitch.js -@@ -35,27 +35,18 @@ - this._client = client; - this._fromDaemon = false; - -- this._clientTrackingId = client.connect('tracking', Lang.bind(this, function(c, state) { -- this._toggle(state); -- })); -- this._toggle(client.is_active()); -- -- this.connect('toggled', Lang.bind(this, function() { -- if (!this._fromDaemon) { -- client.track(this.state, null); -- } -- })); -- -- this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); -+ this.connect('toggled', Lang.bind(this, this._onToggle)); - }, - -- _toggle: function(state) { -+ toggle: function(state) { - this._fromDaemon = true; - this.setToggleState(state); - this._fromDaemon = false; - }, - -- _onDestroy: function() { -- this._client.disconnect(this._clientTrackingId); -+ _onToggle: function() { -+ if (!this._fromDaemon) { -+ this._client.track(this.state, null); -+ } - } - }); diff -Nru gpaste-3.14/debian/rules gpaste-3.14.4.1/debian/rules --- gpaste-3.14/debian/rules 2015-03-16 19:03:24.000000000 +1100 +++ gpaste-3.14.4.1/debian/rules 2015-05-27 03:34:58.000000000 +1000 @@ -6,6 +6,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/gnome.mk +DEB_DH_STRIP_ARGS += --dbg-package=libgpaste2-dbg DEB_DH_AUTORECONF_ARGS += ./autogen.sh DEB_CONFIGURE_EXTRA_FLAGS += --enable-introspection --enable-appdata-validate --enable-applet