Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: empathy

empathy (3.25.90+really3.12.14-1ubuntu1) eoan; urgency=medium * Resynchronize on Debian, see previous merge entry for the details -- Sebastien Bacher <seb128@ubuntu.com> Thu, 27 Jun 2019 11:29:58 +0200

Modifications :
  1. Download patch debian/shlibs.local

    --- 3.25.90+really3.12.14-1/debian/shlibs.local 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/shlibs.local 2019-05-28 08:39:48.000000000 +0000 @@ -0,0 +1,2 @@ +libempathy-gtk 3.12.13 empathy (= ${binary:Version}) +libempathy 3.12.13 empathy (= ${binary:Version})
  2. Download patch debian/indicators/empathy

    --- 3.25.90+really3.12.14-1/debian/indicators/empathy 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/indicators/empathy 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/applications/empathy.desktop
  3. Download patch debian/rules

    --- 3.25.90+really3.12.14-1/debian/rules 2017-10-18 10:10:40.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/rules 2019-06-27 09:38:12.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading.
  4. Download patch debian/patches/00_linker-fixes.patch

    --- 3.25.90+really3.12.14-1/debian/patches/00_linker-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/00_linker-fixes.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,33 @@ +Description: Link with correct libs for empathy-auth-client +Author: Rico Tzschichholz <ricotz@ubuntu.com> + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -85,6 +85,11 @@ + empathy-auth-client.c \ + $(NULL) + ++empathy_auth_client_LDADD = \ ++ $(LDADD) \ ++ $(UOA_LIBS) \ ++ $(NULL) ++ + empathy_chat_SOURCES = \ + chat-manager-interface.c chat-manager-interface.h \ + empathy-about-dialog.c empathy-about-dialog.h \ +--- a/telepathy-account-widgets/tp-account-widgets/Makefile.am ++++ b/telepathy-account-widgets/tp-account-widgets/Makefile.am +@@ -90,6 +90,13 @@ + $(nocheck_sources) \ + $(NULL) + ++libtp_account_widgets_la_LDFLAGS = \ ++ $(CHEESE_LIBS) \ ++ $(TPAW_LIBS) \ ++ $(UOA_LIBS) \ ++ $(UDEV_LIBS) \ ++ $(NULL) ++ + # these are sources that depend on Ubuntu Online Accounts + uoa_sources = \ + tpaw-uoa-utils.c \
  5. Download patch debian/patches/34_start_raised_execpt_in_session.patch

    --- 3.25.90+really3.12.14-1/debian/patches/34_start_raised_execpt_in_session.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/34_start_raised_execpt_in_session.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Start raised (window not hidden) when started explicitly; respect last state when autostarted. + +=== modified file 'src/empathy-status-icon.c' +--- + src/empathy-status-icon.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/src/empathy-status-icon.c ++++ b/src/empathy-status-icon.c +@@ -494,6 +494,8 @@ empathy_status_icon_new (GtkWindow *wind + EmpathyStatusIcon *icon; + gboolean should_hide; + ++ const gchar *desktop_autostart_id; ++ desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); + g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); + + icon = g_object_new (EMPATHY_TYPE_STATUS_ICON, NULL); +@@ -510,8 +512,16 @@ empathy_status_icon_new (GtkWindow *wind + icon); + + if (!hide_contact_list) { +- should_hide = g_settings_get_boolean (priv->gsettings_ui, +- EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN); ++ /* If not started with the session, we should raise the window. ++ https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/503052 */ ++ if (desktop_autostart_id == NULL) { ++ DEBUG ("Not started with session, showing contact list"); ++ should_hide = FALSE; ++ } else { ++ DEBUG ("Auto-started with session, so honor the previous known state"); ++ should_hide = g_settings_get_boolean (priv->gsettings_ui, ++ EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN); ++ } + } else { + should_hide = TRUE; + }
  6. Download patch debian/control

    --- 3.25.90+really3.12.14-1/debian/control 2017-10-18 10:10:40.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/control 2019-06-27 09:49:08.000000000 +0000 @@ -1,7 +1,9 @@ Source: empathy Section: gnome Priority: optional -Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org> +X-Ubuntu-Use-Langpack: yes Uploaders: Sjoerd Simons <sjoerd@debian.org>, Dafydd Harries <daf@debian.org>, Riccardo Setti <giskard@debian.org>, @@ -44,10 +46,13 @@ Build-Depends: at-spi2-core <!nocheck>, xauth <!nocheck>, xsltproc, xvfb <!nocheck>, - yelp-tools + yelp-tools, + libunity-dev (>= 5.0.0) Standards-Version: 4.1.1 -Vcs-Git: https://anonscm.debian.org/git/pkg-telepathy/empathy.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-telepathy/empathy.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/telepathy-team/empathy +XS-Debian-Vcs-Git: https://salsa.debian.org/telepathy-team/empathy.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/empathy +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/empathy Homepage: https://wiki.gnome.org/Apps/Empathy Package: empathy
  7. Download patch debian/patches/10_use_notify_osd_icons.patch

    --- 3.25.90+really3.12.14-1/debian/patches/10_use_notify_osd_icons.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/10_use_notify_osd_icons.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Use the notify-osd image for new message notifications +Bug: https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/409828 + +=== modified file 'libempathy-gtk/empathy-images.h' +--- + libempathy-gtk/empathy-images.h | 1 + + libempathy-gtk/empathy-ui-utils.c | 3 +++ + src/empathy-event-manager.c | 4 ++-- + 3 files changed, 6 insertions(+), 2 deletions(-) + +--- a/libempathy-gtk/empathy-images.h ++++ b/libempathy-gtk/empathy-images.h +@@ -37,6 +37,7 @@ G_BEGIN_DECLS + + #define EMPATHY_IMAGE_MESSAGE "im-message" + #define EMPATHY_IMAGE_NEW_MESSAGE "im-message-new" ++#define EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY "notification-message-im" + #define EMPATHY_IMAGE_TYPING "user-typing" + #define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info" + #define EMPATHY_IMAGE_GROUP_MESSAGE "system-users" +--- a/libempathy-gtk/empathy-ui-utils.c ++++ b/libempathy-gtk/empathy-ui-utils.c +@@ -60,6 +60,9 @@ empathy_gtk_init (void) + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), + PKGDATADIR G_DIR_SEPARATOR_S "icons"); + ++ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ++ DATADIR G_DIR_SEPARATOR_S "notify-osd" G_DIR_SEPARATOR_S "icons"); ++ + /* Add icons from source dir if available */ + if (g_getenv ("EMPATHY_SRCDIR") != NULL) + { +--- a/src/empathy-event-manager.c ++++ b/src/empathy-event-manager.c +@@ -560,11 +560,11 @@ event_manager_chat_message_received_cb ( + msg = empathy_message_get_body (message); + + if (event != NULL) +- event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header, ++ event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, + msg); + else + event_manager_add (approval->manager, NULL, sender, +- EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg, ++ EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, msg, + approval, event_text_channel_process_func, NULL); + + empathy_sound_manager_play (priv->sound_mgr, NULL,
  8. Download patch debian/patches/38_default_to_facebook_for_im.patch

    --- 3.25.90+really3.12.14-1/debian/patches/38_default_to_facebook_for_im.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/38_default_to_facebook_for_im.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,16 @@ +Descrption: Make facebook the default chat account type, it is the most popular now and fits with our Social From the Start theme for Lucid +Author: ? + +=== modified file 'libempathy-gtk/empathy-protocol-chooser.c' +Index: empathy-3.12.6/telepathy-account-widgets/tp-account-widgets/tpaw-protocol.c +=================================================================== +--- empathy-3.12.6.orig/telepathy-account-widgets/tp-account-widgets/tpaw-protocol.c ++++ empathy-3.12.6/telepathy-account-widgets/tp-account-widgets/tpaw-protocol.c +@@ -426,6 +426,7 @@ sort_protocol_value (const gchar *protoc + { + guint i; + const gchar *names[] = { ++ "facebook", + "jabber", + "local-xmpp", + "gtalk",
  9. Download patch debian/patches/41_unity_launcher_progress.patch
  10. Download patch debian/update-patches.mk

    --- 3.25.90+really3.12.14-1/debian/update-patches.mk 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/update-patches.mk 2019-05-28 08:39:48.000000000 +0000 @@ -0,0 +1,11 @@ +update-patches: + mkdir -p $(CURDIR)/debian/patches + rm -f $(CURDIR)/debian/patches/*.patch + git format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream | \ + xargs -n 1 basename > $(CURDIR)/debian/patches/series + for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \ + do \ + lines=$$(cat $$patch | wc -l) ; \ + head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \ + mv $${patch}.chomped $$patch ; \ + done
  11. Download patch debian/patches/series

    --- 3.25.90+really3.12.14-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/series 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,8 @@ +00_linker-fixes.patch +10_use_notify_osd_icons.patch +34_start_raised_execpt_in_session.patch +38_default_to_facebook_for_im.patch +39_default_to_freenode_for_irc.patch +41_unity_launcher_progress.patch +42_shell_running.patch +43_quicklists.patch
  12. Download patch debian/patches/42_shell_running.patch

    --- 3.25.90+really3.12.14-1/debian/patches/42_shell_running.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/42_shell_running.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,99 @@ +Description: Move to the window / move the window to the user depending on Shell or not + +=== modified file 'src/empathy-chat-window.c' +Index: empathy-3.12.6/src/empathy-chat-window.c +=================================================================== +--- empathy-3.12.6.orig/src/empathy-chat-window.c ++++ empathy-3.12.6/src/empathy-chat-window.c +@@ -67,6 +67,7 @@ struct _EmpathyChatWindowPriv + GList *chats; + gboolean page_added; + gboolean dnd_same_window; ++ gboolean shell_running; + EmpathyChatroomManager *chatroom_manager; + EmpathyNotifyManager *notify_mgr; + EmpathyIndividualManager *individual_mgr; +@@ -172,6 +173,35 @@ static void empathy_chat_window_get_nb_c + + G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, GTK_TYPE_WINDOW) + ++ ++#define GNOME_SHELL_BUS_NAME "org.gnome.Shell" ++ ++static void ++list_names_cb (TpDBusDaemon *bus_daemon, ++ const gchar * const *names, ++ const GError *error, ++ gpointer user_data, ++ GObject *weak_object) ++{ ++ EmpathyChatWindow *self = EMPATHY_CHAT_WINDOW (weak_object); ++ guint i; ++ ++ if (error != NULL) ++ goto out; ++ ++ for (i = 0; names[i] != NULL; i++) ++ { ++ if (!tp_strdiff (names[i], GNOME_SHELL_BUS_NAME)) ++ { ++ self->priv->shell_running = TRUE; ++ break; ++ } ++ } ++ ++out: ++ return; ++} ++ + static void + chat_window_accel_cb (GtkAccelGroup *accelgroup, + GObject *object, +@@ -2408,6 +2438,8 @@ empathy_chat_window_init (EmpathyChatWin + GtkWidget *chat_vbox; + gchar *filename; + EmpathySmileyManager *smiley_manager; ++ GError *error = NULL; ++ TpDBusDaemon *dbus; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv); +@@ -2561,6 +2593,15 @@ empathy_chat_window_init (EmpathyChatWin + self->priv->chat_manager, "closed-chats-changed", + G_CALLBACK (chat_window_chat_manager_chats_changed_cb), self); + ++ /* check if Shell is running */ ++ dbus = tp_dbus_daemon_dup (&error); ++ g_assert_no_error (error); ++ ++ tp_dbus_daemon_list_names (dbus, -1, list_names_cb, ++ NULL, NULL, G_OBJECT (self)); ++ ++ g_object_unref (dbus); ++ + chat_window_chat_manager_chats_changed_cb (self->priv->chat_manager, + empathy_chat_manager_get_num_closed_chats (self->priv->chat_manager), self); + +@@ -2855,11 +2896,17 @@ empathy_chat_window_present_chat (Empath + + empathy_chat_window_switch_to_chat (self, chat); + +- /* Don't use tpaw_window_present_with_time () which would move the window +- * to our current desktop but move to the window's desktop instead. This is +- * more coherent with Shell's 'app is ready' notication which moves the view +- * to the app desktop rather than moving the app itself. */ +- empathy_move_to_window_desktop (GTK_WINDOW (self), x_timestamp); ++ /* If gnome-shell is running don't use empathy_window_present_with_time () ++ * which would move the window to our current desktop but move to the ++ * window's desktop instead. This is more coherent with Shell's ++ * 'app is ready' notication which moves the view to the app desktop ++ * rather than moving the app itself. ++ * If gnome-shell isn't running, move the window to the current desktop */ ++ ++ if (!self->priv->shell_running) ++ tpaw_window_present_with_time (GTK_WINDOW (self), x_timestamp); ++ else ++ empathy_move_to_window_desktop (GTK_WINDOW (self), x_timestamp); + + gtk_widget_grab_focus (chat->input_text_view); + return self;
  13. Download patch debian/empathy.install

    --- 3.25.90+really3.12.14-1/debian/empathy.install 2017-10-18 10:10:40.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/empathy.install 2019-06-27 09:41:07.000000000 +0000 @@ -9,3 +9,4 @@ usr/share/dbus-1/services/ usr/share/glib-2.0/schemas/ usr/share/man/man1/ usr/share/telepathy/clients/ +debian/indicators/empathy /usr/share/indicators/messages/applications/
  14. Download patch debian/patches/43_quicklists.patch

    --- 3.25.90+really3.12.14-1/debian/patches/43_quicklists.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/43_quicklists.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Add some Unity Quicklists + +Index: b/data/empathy.desktop.in.in +=================================================================== +--- a/data/empathy.desktop.in.in ++++ b/data/empathy.desktop.in.in +@@ -15,4 +15,16 @@ + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=empathy + X-GNOME-Bugzilla-Component=General +-X-GNOME-Bugzilla-Version=@VERSION@ ++X-GNOME-Bugzilla-Version=@VERSION@8 ++X-MessagingMenu-UsesChatSection=true ++Actions=Hidden;Prefs; ++ ++[Desktop Action Hidden] ++_Name=Open Hidden in Background ++Exec=empathy -h ++NotShowIn=Messaging Menu ++ ++[Desktop Action Prefs] ++_Name=Open Preferences ++Exec=empathy -p ++NotShowIn=Messaging Menu
  15. Download patch debian/patches/39_default_to_freenode_for_irc.patch

    --- 3.25.90+really3.12.14-1/debian/patches/39_default_to_freenode_for_irc.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/patches/39_default_to_freenode_for_irc.patch 2017-10-11 14:19:38.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Connect to Freenode IRC by default for Ubuntu channels + +=== modified file 'libempathy-gtk/empathy-irc-network-chooser.c' +Index: empathy-3.10.0/telepathy-account-widgets/tp-account-widgets/tpaw-irc-network-chooser.c +=================================================================== +--- empathy-3.10.0.orig/telepathy-account-widgets/tp-account-widgets/tpaw-irc-network-chooser.c ++++ empathy-3.10.0/telepathy-account-widgets/tp-account-widgets/tpaw-irc-network-chooser.c +@@ -29,7 +29,7 @@ + #define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC + #include "tpaw-debug.h" + +-#define DEFAULT_IRC_NETWORK "irc.gimp.org" ++#define DEFAULT_IRC_NETWORK "chat.freenode.net" + #define DEFAULT_IRC_PORT 6667 + #define DEFAULT_IRC_SSL FALSE +
  16. Download patch debian/gbp.conf

    --- 3.25.90+really3.12.14-1/debian/gbp.conf 2017-10-18 10:10:40.000000000 +0000 +++ 3.25.90+really3.12.14-1ubuntu1/debian/gbp.conf 2019-05-28 08:39:48.000000000 +0000 @@ -1,9 +1,6 @@ [DEFAULT] -debian-branch = debian -upstream-branch = upstream -pristine-tar = True -compression = xz - -[git-buildpackage] -tarball-dir = ../tarballs/ -export-dir = ../build-area/ +debian-branch=ubuntu/master +upstream-branch=upstream +debian-tag=ubuntu/%(version)s +upstream-vcs-tag=%(version)s +pristine-tar=True
  1. empathy