diff -Nru remmina-1.1.2/debian/changelog remmina-1.1.2/debian/changelog --- remmina-1.1.2/debian/changelog 2016-09-30 03:15:02.000000000 +0000 +++ remmina-1.1.2/debian/changelog 2017-01-03 21:30:27.000000000 +0000 @@ -1,3 +1,46 @@ +remmina (1.1.2-4ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build-depend on libappindicator3-dev, intltool to enable + support + - debian/patches/translations.patch, + - Make translatable and add keywords. + - disable 0005-desktop.patch included in translations.patch + + -- Gianfranco Costamagna Tue, 03 Jan 2017 22:27:53 +0100 + +remmina (1.1.2-4) unstable; urgency=medium + + * debian/control: + - Change homepage. + - Bump Standards-Version to 3.9.8 (no changes required). + - Change Vcs-* to secure uri. + - Change cmake release to >= 3.5. + - Switch Depends from dbus-x11 to + default-dbus-session-bus | dbus-session-bus (Closes: #836045). + - Remove unneeded versions from Depends. + * Rename patches. + * Add 2016 at debian/copyright. + * New debian/paches/0705-wayland.patch (Closes: #801963): + - Disable wayland to prevend system crashes. + * Migrate to debhelper 10: + - Change debian/compat to 10. + - Change debhelper version in debian/control to >= 10. + * Remove not longer needed debian/menu. + * Rewrite debian/watch. + * Update patch 0700-desktop.patch by adding the list separator at the end of + the Keywords key: this makes remmina.desktop valid (Closes: #812479). + Thanks to Pino Toscano . + * New debian/README.debian: + - Add section about keymapping (Closes: #763723). + * debian/rules: + - Enable hardening. + * Use the automatic debug symbol packages: + - debian/control: Remove remmina-dbg. + - debian/rules: Remove --dbg-package=remmina-dbg + + -- Jörg Frings-Fürst Tue, 27 Dec 2016 13:58:18 +0100 + remmina (1.1.2-3ubuntu2) yakkety; urgency=medium * debian/control.in: diff -Nru remmina-1.1.2/debian/compat remmina-1.1.2/debian/compat --- remmina-1.1.2/debian/compat 2015-10-02 13:03:54.000000000 +0000 +++ remmina-1.1.2/debian/compat 2017-01-01 21:43:08.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru remmina-1.1.2/debian/control remmina-1.1.2/debian/control --- remmina-1.1.2/debian/control 2016-09-30 03:15:02.000000000 +0000 +++ remmina-1.1.2/debian/control 2017-01-02 17:00:08.000000000 +0000 @@ -4,26 +4,26 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Jörg Frings-Fürst Build-Depends: - cmake (>= 2.8), - debhelper (>= 9~), - libavahi-ui-gtk3-dev (>= 0.6.0), - libfreerdp-dev (>= 1.1.0~), + cmake (>= 3.5), + debhelper (>= 10~), + libavahi-ui-gtk3-dev, + libfreerdp-dev, libgcrypt20-dev, libgnome-keyring-dev, libgnutls28-dev, libgtk-3-dev, libjpeg-dev, - libssh-dev (>= 0.4), + libssh-dev, libtelepathy-glib-dev, libvncserver-dev, libvte-2.91-dev, libxkbfile-dev, libappindicator3-dev, intltool -Standards-Version: 3.9.6 -Homepage: http://remmina.sourceforge.net/ -Vcs-Git: git://anonscm.debian.org/collab-maint/remmina.git -Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/remmina.git +Standards-Version: 3.9.8 +Homepage: http://www.remmina.org/ +Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/remmina.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/remmina.git Package: remmina Architecture: any @@ -127,23 +127,3 @@ . This package contains the GNOME Keyring plugin for Remmina, which allows one to store and retrieve passwords from GNOME Keyring. - -Package: remmina-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - remmina (= ${binary:Version}), - remmina-plugin-rdp (= ${binary:Version}), - remmina-plugin-vnc (= ${binary:Version}), - remmina-plugin-xdmcp (= ${binary:Version}), - remmina-plugin-nx (= ${binary:Version}), - remmina-plugin-telepathy (= ${binary:Version}), - remmina-plugin-gnome (= ${binary:Version}) -Description: remote desktop client - debug pakcage - Remmina is a remote desktop connection client able to display and control a - remote desktop session. - . - This package provides debugging symbols for remmina and its plugins. diff -Nru remmina-1.1.2/debian/copyright remmina-1.1.2/debian/copyright --- remmina-1.1.2/debian/copyright 2015-10-02 13:03:54.000000000 +0000 +++ remmina-1.1.2/debian/copyright 2017-01-01 21:43:08.000000000 +0000 @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: remmina Upstream-Contact: Marc-Andre Moreau -Source: http://remmina.sourceforge.net +Source: http://www.remmina.org/ Files: * Copyright: 2009-2011, Vic Lee @@ -19,7 +19,7 @@ Files: debian/* Copyright: 2009-2015 Luca Falavigna - 2015 Jörg Frings-Fürst + 2015-2016 Jörg Frings-Fürst License: GPL-2+ with SSL exception License: GPL-2+ with SSL exception diff -Nru remmina-1.1.2/debian/menu remmina-1.1.2/debian/menu --- remmina-1.1.2/debian/menu 2015-10-02 13:03:54.000000000 +0000 +++ remmina-1.1.2/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(remmina):needs="X11" section="Applications/Network/Communication"\ - title="Remmina" command="/usr/bin/remmina" diff -Nru remmina-1.1.2/debian/patches/0005-desktop.patch remmina-1.1.2/debian/patches/0005-desktop.patch --- remmina-1.1.2/debian/patches/0005-desktop.patch 2015-10-02 13:03:54.000000000 +0000 +++ remmina-1.1.2/debian/patches/0005-desktop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Add Keywords to desktop file -Author: Jörg Frings-Fürst -Forwarded: not-needed -Last-Update: 2015-09-29 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/Index: trunk/remmina/desktop/remmina.desktop -=================================================================== ---- trunk.orig/remmina/desktop/remmina.desktop -+++ trunk/remmina/desktop/remmina.desktop -@@ -72,6 +72,7 @@ Terminal=false - Type=Application - Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; - Actions=Profile;Tray; -+Keywords=remote desktop;rdp;vnc;nx,ssh - - [Desktop Action Profile] - Name=Create a New Connection Profile diff -Nru remmina-1.1.2/debian/patches/0100-external_tools.patch remmina-1.1.2/debian/patches/0100-external_tools.patch --- remmina-1.1.2/debian/patches/0100-external_tools.patch 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/patches/0100-external_tools.patch 2015-09-29 08:56:35.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Look for external tools into a system directory +Author: Luca Falavigna + +Index: remmina/remmina/src/remmina_external_tools.c +=================================================================== +--- remmina.orig/remmina/src/remmina_external_tools.c ++++ remmina/remmina/src/remmina_external_tools.c +@@ -33,7 +33,7 @@ gboolean remmina_external_tools_from_fil + GNode* root; + root = g_node_new(NULL); + +- g_snprintf(dirname, MAX_PATH_LEN, "%s/.remmina/external_tools", g_get_home_dir()); ++ g_snprintf(dirname, MAX_PATH_LEN, "/usr/share/remmina/external_tools"); + dir = g_dir_open(dirname, 0, NULL); + + if (dir == NULL) +@@ -72,7 +72,7 @@ gboolean remmina_external_tools_launcher + { + RemminaFile *remminafile; + gchar launcher[MAX_PATH_LEN]; +- g_snprintf(launcher, MAX_PATH_LEN, "%s/.remmina/external_tools/launcher.sh", g_get_home_dir()); ++ g_snprintf(launcher, MAX_PATH_LEN, "/usr/share/remmina/external_tools/launcher.sh"); + + remminafile = remmina_file_load(filename); + GHashTableIter iter; +Index: remmina/remmina/CMakeLists.txt +=================================================================== +--- remmina.orig/remmina/CMakeLists.txt ++++ remmina/remmina/CMakeLists.txt +@@ -173,7 +173,6 @@ if(WITH_TRANSLATIONS) + endif() + add_subdirectory(icons) + add_subdirectory(desktop) +-add_subdirectory(external_tools) + + install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR}) + diff -Nru remmina-1.1.2/debian/patches/0105-fix_RDP_Clipboard.patch remmina-1.1.2/debian/patches/0105-fix_RDP_Clipboard.patch --- remmina-1.1.2/debian/patches/0105-fix_RDP_Clipboard.patch 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/patches/0105-fix_RDP_Clipboard.patch 2015-11-08 13:55:34.000000000 +0000 @@ -0,0 +1,90 @@ +Index: remmina-plugins/rdp/rdp_cliprdr.c +=================================================================== +--- remmina-plugins.orig/rdp/rdp_cliprdr.c ++++ remmina-plugins/rdp/rdp_cliprdr.c +@@ -308,7 +308,7 @@ int remmina_rdp_cliprdr_server_file_contents_response(CliprdrClientContext* cont + } + + +-static int remmina_rdp_cliprdr_monitor_ready(CliprdrClientContext* context, CLIPRDR_MONITOR_READY* monitorReady) ++static UINT remmina_rdp_cliprdr_monitor_ready(CliprdrClientContext* context, CLIPRDR_MONITOR_READY* monitorReady) + { + TRACE_CALL("remmina_rdp_cliprdr_monitor_ready"); + RemminaPluginRdpUiObject* ui; +@@ -323,17 +323,17 @@ static int remmina_rdp_cliprdr_monitor_ready(CliprdrClientContext* context, CLIP + ui->clipboard.type = REMMINA_RDP_UI_CLIPBOARD_MONITORREADY; + rf_queue_ui(gp, ui); + +- return 1; ++ return CHANNEL_RC_OK; + } + +-static int remmina_rdp_cliprdr_server_capabilities(CliprdrClientContext* context, CLIPRDR_CAPABILITIES* capabilities) ++static UINT remmina_rdp_cliprdr_server_capabilities(CliprdrClientContext* context, CLIPRDR_CAPABILITIES* capabilities) + { + TRACE_CALL("remmina_rdp_cliprdr_server_capabilities"); +- return 1; ++ return CHANNEL_RC_OK; + } + + +-static int remmina_rdp_cliprdr_server_format_list(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST* formatList) ++static UINT remmina_rdp_cliprdr_server_format_list(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST* formatList) + { + TRACE_CALL("remmina_rdp_cliprdr_server_format_list"); + +@@ -399,17 +399,17 @@ static int remmina_rdp_cliprdr_server_format_list(CliprdrClientContext* context, + ui->clipboard.targetlist = list; + rf_queue_ui(gp, ui); + +- return 1; ++ return CHANNEL_RC_OK; + } + +-static int remmina_rdp_cliprdr_server_format_list_response(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse) ++static UINT remmina_rdp_cliprdr_server_format_list_response(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse) + { + TRACE_CALL("remmina_rdp_cliprdr_server_format_list_response"); +- return 1; ++ return CHANNEL_RC_OK; + } + + +-static int remmina_rdp_cliprdr_server_format_data_request(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest) ++static UINT remmina_rdp_cliprdr_server_format_data_request(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest) + { + TRACE_CALL("remmina_rdp_cliprdr_server_format_data_request"); + +@@ -427,12 +427,13 @@ static int remmina_rdp_cliprdr_server_format_data_request(CliprdrClientContext* + ui->clipboard.format = formatDataRequest->requestedFormatId; + rf_queue_ui(gp, ui); + +- return 1; ++ return CHANNEL_RC_OK; + } + +-static int remmina_rdp_cliprdr_server_format_data_response(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse) ++static UINT remmina_rdp_cliprdr_server_format_data_response(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse) + { + TRACE_CALL("remmina_rdp_cliprdr_server_format_data_response"); ++ + UINT8* data; + size_t size; + rfContext* rfi; +@@ -565,7 +566,7 @@ static int remmina_rdp_cliprdr_server_format_data_response(CliprdrClientContext* + } + pthread_mutex_unlock(&clipboard->transfer_clip_mutex); + +- return 1; ++ return CHANNEL_RC_OK; + } + + void remmina_rdp_cliprdr_request_data(GtkClipboard *gtkClipboard, GtkSelectionData *selection_data, guint info, RemminaProtocolWidget* gp ) +@@ -933,6 +934,7 @@ void remmina_rdp_clipboard_free(rfContext *rfi) + void remmina_rdp_cliprdr_init(rfContext* rfi, CliprdrClientContext* cliprdr) + { + TRACE_CALL("remmina_rdp_cliprdr_init"); ++ + rfClipboard* clipboard; + clipboard = &(rfi->clipboard); + \ No newline at end of file diff -Nru remmina-1.1.2/debian/patches/0110-vte-master.patch remmina-1.1.2/debian/patches/0110-vte-master.patch --- remmina-1.1.2/debian/patches/0110-vte-master.patch 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/patches/0110-vte-master.patch 2016-04-23 08:58:51.000000000 +0000 @@ -0,0 +1,113 @@ +diff --git a/remmina/src/remmina_masterthread_exec.c b/remmina/src/remmina_masterthread_exec.c +index e6b03ee..3500b07 100644 +--- a/remmina/src/remmina_masterthread_exec.c ++++ b/remmina/src/remmina_masterthread_exec.c +@@ -108,7 +108,8 @@ static gboolean remmina_masterthread_exec_callback(RemminaMTExecData *d) + case FUNC_VTE_TERMINAL_SET_ENCODING_AND_PTY: + #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE) + remmina_plugin_ssh_vte_terminal_set_encoding_and_pty( d->p.vte_terminal_set_encoding_and_pty.terminal, +- d->p.vte_terminal_set_encoding_and_pty.codeset, d->p.vte_terminal_set_encoding_and_pty.slave ); ++ d->p.vte_terminal_set_encoding_and_pty.codeset, ++ d->p.vte_terminal_set_encoding_and_pty.master, d->p.vte_terminal_set_encoding_and_pty.slave ); + #endif + break; + } +diff --git a/remmina/src/remmina_masterthread_exec.h b/remmina/src/remmina_masterthread_exec.h +index 477616c..a0e9fa4 100644 +--- a/remmina/src/remmina_masterthread_exec.h ++++ b/remmina/src/remmina_masterthread_exec.h +@@ -152,6 +152,7 @@ typedef struct remmina_masterthread_exec_data + { + VteTerminal *terminal; + const char *codeset; ++ int master; + int slave; + } vte_terminal_set_encoding_and_pty; + #endif +diff --git a/remmina/src/remmina_ssh.c b/remmina/src/remmina_ssh.c +index 207732a..e02f6c8 100644 +--- a/remmina/src/remmina_ssh.c ++++ b/remmina/src/remmina_ssh.c +@@ -1531,15 +1531,15 @@ remmina_ssh_shell_thread (gpointer data) + timeout.tv_usec = 0; + + FD_ZERO (&fds); +- FD_SET (shell->master, &fds); ++ FD_SET (shell->slave, &fds); + +- ret = ssh_select (ch, chout, shell->master + 1, &fds, &timeout); ++ ret = ssh_select (ch, chout, shell->slave + 1, &fds, &timeout); + if (ret == SSH_EINTR) continue; + if (ret == -1) break; + +- if (FD_ISSET (shell->master, &fds)) ++ if (FD_ISSET (shell->slave, &fds)) + { +- len = read (shell->master, buf, buf_len); ++ len = read (shell->slave, buf, buf_len); + if (len <= 0) break; + LOCK_SSH (shell) + ssh_channel_write (channel, buf, len); +@@ -1571,7 +1571,7 @@ remmina_ssh_shell_thread (gpointer data) + } + while (len > 0) + { +- ret = write (shell->master, buf, len); ++ ret = write (shell->slave, buf, len); + if (ret <= 0) break; + len -= ret; + } +diff --git a/remmina/src/remmina_ssh_plugin.c b/remmina/src/remmina_ssh_plugin.c +index aa84263..a7f6452 100644 +--- a/remmina/src/remmina_ssh_plugin.c ++++ b/remmina/src/remmina_ssh_plugin.c +@@ -143,14 +143,14 @@ remmina_plugin_ssh_main_thread (gpointer data) + gpdata->shell = shell; + + charset = REMMINA_SSH (shell)->charset; +- remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VTE_TERMINAL (gpdata->vte), charset, shell->slave); ++ remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VTE_TERMINAL (gpdata->vte), charset, shell->master, shell->slave); + remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect"); + + gpdata->thread = 0; + return NULL; + } + +-void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int slave) ++void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int master, int slave) + { + TRACE_CALL("remmina_plugin_ssh_vte_terminal_set_encoding_and_pty"); + if ( !remmina_masterthread_exec_is_main_thread() ) +@@ -161,6 +161,7 @@ void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, + d->func = FUNC_VTE_TERMINAL_SET_ENCODING_AND_PTY; + d->p.vte_terminal_set_encoding_and_pty.terminal = terminal; + d->p.vte_terminal_set_encoding_and_pty.codeset = codeset; ++ d->p.vte_terminal_set_encoding_and_pty.master = master; + d->p.vte_terminal_set_encoding_and_pty.slave = slave; + remmina_masterthread_exec_and_wait(d); + g_free(d); +@@ -182,9 +183,9 @@ void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, + vte_terminal_set_delete_binding(terminal, VTE_ERASE_DELETE_SEQUENCE); + + #if !VTE_CHECK_VERSION(0,38,0) +- vte_terminal_set_pty (terminal, slave); ++ vte_terminal_set_pty (terminal, master); + #else +- vte_terminal_set_pty (terminal, vte_pty_new_foreign_sync(slave, NULL, NULL)); ++ vte_terminal_set_pty (terminal, vte_pty_new_foreign_sync(master, NULL, NULL)); + #endif + + } +diff --git a/remmina/src/remmina_ssh_plugin.h b/remmina/src/remmina_ssh_plugin.h +index 336bd9b..2d3b16c 100644 +--- a/remmina/src/remmina_ssh_plugin.h ++++ b/remmina/src/remmina_ssh_plugin.h +@@ -46,7 +46,7 @@ void remmina_ssh_plugin_register(void); + + /* For callback in main thread */ + #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE) +-void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int slave); ++void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int master, int slave); + void remmina_plugin_ssh_vte_select_all (GtkMenuItem *menuitem, gpointer user_data); + void remmina_plugin_ssh_vte_copy_clipboard (GtkMenuItem *menuitem, gpointer user_data); + void remmina_plugin_ssh_vte_paste_clipboard (GtkMenuItem *menuitem, gpointer user_data); diff -Nru remmina-1.1.2/debian/patches/0700-desktop.patch remmina-1.1.2/debian/patches/0700-desktop.patch --- remmina-1.1.2/debian/patches/0700-desktop.patch 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/patches/0700-desktop.patch 2016-12-26 10:18:42.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Add Keywords to desktop file +Author: Jörg Frings-Fürst +Forwarded: not-needed +Last-Update: 2015-09-29 +-- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/Index: trunk/remmina/desktop/remmina.desktop +=================================================================== +--- trunk.orig/remmina/desktop/remmina.desktop ++++ trunk/remmina/desktop/remmina.desktop +@@ -72,6 +72,7 @@ Terminal=false + Type=Application + Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; + Actions=Profile;Tray; ++Keywords=remote desktop;rdp;vnc;nx;ssh; + + [Desktop Action Profile] + Name=Create a New Connection Profile diff -Nru remmina-1.1.2/debian/patches/0705-wayland.patch remmina-1.1.2/debian/patches/0705-wayland.patch --- remmina-1.1.2/debian/patches/0705-wayland.patch 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/patches/0705-wayland.patch 2016-12-27 11:40:19.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Set allowed backends to "x11,broadway,quartz" to + prevend crashes with wayland. +Bug: https://github.com/FreeRDP/Remmina/pull/680 +Bug-Debian: https://bugs.debian.org/801963 +Last-Update: 2016-12-27 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/remmina/src/remmina.c +=================================================================== +--- trunk.orig/remmina/src/remmina.c ++++ trunk/remmina/src/remmina.c +@@ -211,6 +211,8 @@ int main(int argc, char* argv[]) + GApplication* app; + int status; + ++ gdk_set_allowed_backends("x11,broadway,quartz"); ++ + bindtextdomain(GETTEXT_PACKAGE, REMMINA_LOCALEDIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); diff -Nru remmina-1.1.2/debian/patches/external_tools.patch remmina-1.1.2/debian/patches/external_tools.patch --- remmina-1.1.2/debian/patches/external_tools.patch 2015-10-02 13:03:54.000000000 +0000 +++ remmina-1.1.2/debian/patches/external_tools.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -Description: Look for external tools into a system directory -Author: Luca Falavigna - -Index: remmina/remmina/src/remmina_external_tools.c -=================================================================== ---- remmina.orig/remmina/src/remmina_external_tools.c -+++ remmina/remmina/src/remmina_external_tools.c -@@ -33,7 +33,7 @@ gboolean remmina_external_tools_from_fil - GNode* root; - root = g_node_new(NULL); - -- g_snprintf(dirname, MAX_PATH_LEN, "%s/.remmina/external_tools", g_get_home_dir()); -+ g_snprintf(dirname, MAX_PATH_LEN, "/usr/share/remmina/external_tools"); - dir = g_dir_open(dirname, 0, NULL); - - if (dir == NULL) -@@ -72,7 +72,7 @@ gboolean remmina_external_tools_launcher - { - RemminaFile *remminafile; - gchar launcher[MAX_PATH_LEN]; -- g_snprintf(launcher, MAX_PATH_LEN, "%s/.remmina/external_tools/launcher.sh", g_get_home_dir()); -+ g_snprintf(launcher, MAX_PATH_LEN, "/usr/share/remmina/external_tools/launcher.sh"); - - remminafile = remmina_file_load(filename); - GHashTableIter iter; -Index: remmina/remmina/CMakeLists.txt -=================================================================== ---- remmina.orig/remmina/CMakeLists.txt -+++ remmina/remmina/CMakeLists.txt -@@ -173,7 +173,6 @@ if(WITH_TRANSLATIONS) - endif() - add_subdirectory(icons) - add_subdirectory(desktop) --add_subdirectory(external_tools) - - install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR}) - diff -Nru remmina-1.1.2/debian/patches/series remmina-1.1.2/debian/patches/series --- remmina-1.1.2/debian/patches/series 2016-03-29 02:27:49.000000000 +0000 +++ remmina-1.1.2/debian/patches/series 2017-01-03 21:27:02.000000000 +0000 @@ -1,3 +1,6 @@ -#0005-desktop.patch -external_tools.patch +#0700-desktop.patch +0100-external_tools.patch +#0105-fix_RDP_Clipboard.patch +#0110-vte-master.patch +0705-wayland.patch translations.patch diff -Nru remmina-1.1.2/debian/patches/translations.patch remmina-1.1.2/debian/patches/translations.patch --- remmina-1.1.2/debian/patches/translations.patch 2016-03-29 02:27:49.000000000 +0000 +++ remmina-1.1.2/debian/patches/translations.patch 2017-01-03 21:26:50.000000000 +0000 @@ -5,7 +5,7 @@ =================================================================== --- /dev/null +++ b/remmina/desktop/remmina.desktop.in -@@ -0,0 +1,22 @@ +@@ -0,0 +1,23 @@ +[Desktop Entry] +Version=1.0 +_Name=Remmina @@ -17,9 +17,10 @@ +Icon=remmina +Terminal=false +Type=Application ++Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; +Actions=Profile;Tray; +Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; -+_Keywords=remote desktop;rdp;vnc;nx,ssh;VNC;XDMCP;RDP; ++_Keywords=remote desktop;rdp;vnc;nx;ssh;VNC;XDMCP;RDP; + +[Desktop Action Profile] +_Name=Create a New Connection Profile @@ -36,7 +37,7 @@ Type=Application Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; Actions=Profile;Tray; -+Keywords=remote desktop;rdp;vnc;nx,ssh;VNC;XDMCP;RDP; ++Keywords=remote desktop;rdp;vnc;nx;ssh;VNC;XDMCP;RDP; +X-Ubuntu-Gettext-Domain=remmina [Desktop Action Profile] diff -Nru remmina-1.1.2/debian/README.Debian remmina-1.1.2/debian/README.Debian --- remmina-1.1.2/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/README.Debian 2016-12-26 10:57:21.000000000 +0000 @@ -0,0 +1,10 @@ +remmina for Debian +------------------ + +Notes for Keymaping: + +For use the superkey + another please unset Keymap to empty +('Keymap=' in connection file instead of 'Keymap=Map Meta Keys'). + + + -- Jörg Frings-Fürst Mon, 29 Sep 2014 09:17:15 +0200 diff -Nru remmina-1.1.2/debian/rules remmina-1.1.2/debian/rules --- remmina-1.1.2/debian/rules 2016-03-29 02:27:49.000000000 +0000 +++ remmina-1.1.2/debian/rules 2017-01-01 21:43:07.000000000 +0000 @@ -1,9 +1,12 @@ #!/usr/bin/make -f +# hardening +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + LDFLAGS += -Wl,--as-needed %: - dh $@ --dbg-package=remmina-dbg + dh $@ override_dh_install: dh_install diff -Nru remmina-1.1.2/debian/watch remmina-1.1.2/debian/watch --- remmina-1.1.2/debian/watch 2015-10-02 13:03:54.000000000 +0000 +++ remmina-1.1.2/debian/watch 2017-01-01 21:43:08.000000000 +0000 @@ -1,4 +1,3 @@ version=3 -opts=uversionmangle=s/^(\S+-rcgit)/0.0.$1/ \ -https://github.com/FreeRDP/Remmina/releases \ -.*[^n]/(?:|v|version-|version|release-|r|REL_|rel-|remmina(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/remmina_$1\.tar\.gz/ \ +https://github.com/FreeRDP/Remmina/releases /FreeRDP/Remmina/archive/v(.+)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)