diff -Nru remmina-1.1.2/debian/changelog remmina-1.1.2/debian/changelog --- remmina-1.1.2/debian/changelog 2015-08-10 23:37:07.000000000 +0000 +++ remmina-1.1.2/debian/changelog 2016-03-29 02:27:49.000000000 +0000 @@ -1,3 +1,41 @@ +remmina (1.1.2-3ubuntu1) xenial; urgency=low + + * Merge from Debian unstable (LP: #1556383). Remaining changes: + - Switch build depends from transitional libgnutsl28-dev to libgnutls-dev + + debian/control: + - Build-depend on libappindicator3-dev, intltool + + debian/rules: + - Build with libappindicator + - Call intltool-update on build + + debian/patches/translations.patch, + - Make translatable and add keywords. + - disable 0005-desktop.patch included in translations.patch + + -- Gianfranco Costamagna Sat, 12 Mar 2016 09:05:49 +0100 + +remmina (1.1.2-3) unstable; urgency=medium + + [ Jörg Frings-Fürst ] + * New Maintainer. (Closes: #755303) + * debian/control: + - Set myself as Maintainer. + - Reorder *-Depends. + - Change requested cmake version to >= 2.8. + - Change Vcs-* to new cgit based repository viewer. + * debian/copyright: + - Add myself to the list of authors for debian/*. + - Change GPL-2+ to GPL-2+ with SSL exception. + * debian/watch: + - Add changes from bartm. + Thanks to Bart Martens + + [ Luca Falavigna ] + * debian/control: + - Switch to vte 2.91 (Closes: #788020). + - Remove obsolete Breaks/Replaces fields. + + -- Jörg Frings-Fürst Wed, 30 Sep 2015 19:15:27 +0200 + remmina (1.1.2-2ubuntu3) wily; urgency=medium * debian/control: diff -Nru remmina-1.1.2/debian/control remmina-1.1.2/debian/control --- remmina-1.1.2/debian/control 2015-08-10 23:36:44.000000000 +0000 +++ remmina-1.1.2/debian/control 2016-03-29 02:27:49.000000000 +0000 @@ -2,39 +2,39 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Luca Falavigna -Uploaders: Jean-Louis Dupond -Build-Depends: debhelper (>= 9~), - cmake (>= 2.6), - libgtk-3-dev, +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~), libgcrypt20-dev, + libgnome-keyring-dev, + libgnutls-dev, + libgtk-3-dev, + libjpeg-dev, libssh-dev (>= 0.4), - libvte-2.91-dev, - libxkbfile-dev, - libfreerdp-dev (>= 1.1.0~), libtelepathy-glib-dev, - libjpeg-dev, - libgnutls-dev, - libgnome-keyring-dev, - libavahi-ui-gtk3-dev (>= 0.6.0), 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/gitweb/?p=collab-maint/remmina.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/remmina.git Package: remmina Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina-common (= ${source:Version}), dbus-x11 -Recommends: remmina-plugin-rdp, +Recommends: + remmina-plugin-rdp, remmina-plugin-vnc -Breaks: remmina-plugin-data (<= 0.9) -Replaces: remmina-gnome, remmina-xfce Description: remote desktop client for GNOME desktop environment Remmina is a remote desktop connection client able to display and control a remote desktop session. @@ -46,10 +46,6 @@ Architecture: all Depends: ${misc:Depends} Recommends: remmina -Breaks: remmina (<< 1.0.0), - remmina-plugin-data -Replaces: remmina (<< 1.0.0), - remmina-plugin-data Description: common files for remmina remote desktop client Remmina is a remote desktop connection client able to display and control a remote desktop session. @@ -58,7 +54,8 @@ Package: remmina-plugin-rdp Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) Recommends: libfreerdp-plugins-standard @@ -70,7 +67,8 @@ Package: remmina-plugin-vnc Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) Description: VNC plugin for remmina remote desktop client @@ -81,7 +79,8 @@ Package: remmina-plugin-xdmcp Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}), xserver-xephyr @@ -93,7 +92,8 @@ Package: remmina-plugin-nx Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}), nxproxy @@ -105,7 +105,8 @@ Package: remmina-plugin-telepathy Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) Description: Telepathy plugin for remmina remote desktop client @@ -116,7 +117,8 @@ Package: remmina-plugin-gnome Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) Description: GNOME plugin for remmina remote desktop client @@ -130,7 +132,8 @@ Section: debug Priority: extra Architecture: any -Depends: ${shlibs:Depends}, +Depends: + ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}), remmina-plugin-rdp (= ${binary:Version}), diff -Nru remmina-1.1.2/debian/copyright remmina-1.1.2/debian/copyright --- remmina-1.1.2/debian/copyright 2015-04-26 15:15:42.000000000 +0000 +++ remmina-1.1.2/debian/copyright 2015-10-02 13:03:54.000000000 +0000 @@ -11,17 +11,18 @@ 2012, Jean-Louis Dupond 2012, Andrey Gankov 2012, Luca Falavigna -License: GPL-2+ +License: GPL-2+ with SSL exception Files: cmake/FindOptionalPackage.cmake Copyright: 2011, Nils Andresen License: Apache-2.0 Files: debian/* -Copyright: 2009-2014 Luca Falavigna -License: GPL-2+ +Copyright: 2009-2015 Luca Falavigna + 2015 Jörg Frings-Fürst +License: GPL-2+ with SSL exception -License: GPL-2+ +License: GPL-2+ with SSL exception This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your diff -Nru remmina-1.1.2/debian/docs remmina-1.1.2/debian/docs --- remmina-1.1.2/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/docs 2015-10-02 13:03:54.000000000 +0000 @@ -0,0 +1 @@ +README 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 1970-01-01 00:00:00.000000000 +0000 +++ remmina-1.1.2/debian/patches/0005-desktop.patch 2015-10-02 13:03:54.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/indicator_set_title.patch remmina-1.1.2/debian/patches/indicator_set_title.patch --- remmina-1.1.2/debian/patches/indicator_set_title.patch 2014-11-07 16:13:08.000000000 +0000 +++ remmina-1.1.2/debian/patches/indicator_set_title.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Set a title so the unity-hud doesn't list as "untitled" -Ubuntu: https://launchpad.net/bugs/943434 - -Index: b/remmina/src/remmina_icon.c -=================================================================== ---- a/remmina/src/remmina_icon.c -+++ b/remmina/src/remmina_icon.c -@@ -411,6 +411,7 @@ - app_indicator_set_icon_theme_path (remmina_icon.icon, REMMINA_DATADIR G_DIR_SEPARATOR_S "icons"); - - app_indicator_set_status (remmina_icon.icon, APP_INDICATOR_STATUS_ACTIVE); -+ app_indicator_set_title (remmina_icon.icon, "Remmina"); - remmina_icon_populate_menu (); - #else - remmina_icon.icon = gtk_status_icon_new_from_icon_name("remmina"); diff -Nru remmina-1.1.2/debian/patches/series remmina-1.1.2/debian/patches/series --- remmina-1.1.2/debian/patches/series 2015-05-18 14:49:50.000000000 +0000 +++ remmina-1.1.2/debian/patches/series 2016-03-29 02:27:49.000000000 +0000 @@ -1,2 +1,3 @@ -translations.patch +#0005-desktop.patch external_tools.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 2014-11-07 16:37:58.000000000 +0000 +++ remmina-1.1.2/debian/patches/translations.patch 2016-03-29 02:27:49.000000000 +0000 @@ -5,7 +5,7 @@ =================================================================== --- /dev/null +++ b/remmina/desktop/remmina.desktop.in -@@ -0,0 +1,23 @@ +@@ -0,0 +1,22 @@ +[Desktop Entry] +Version=1.0 +_Name=Remmina @@ -17,10 +17,9 @@ +Icon=remmina +Terminal=false +Type=Application -+Actions= -+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; -+_Keywords=VNC;XDMCP;RDP; +Actions=Profile;Tray; ++Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; ++_Keywords=remote desktop;rdp;vnc;nx,ssh;VNC;XDMCP;RDP; + +[Desktop Action Profile] +_Name=Create a New Connection Profile @@ -37,7 +36,7 @@ Type=Application Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; Actions=Profile;Tray; -+Keywords=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/watch remmina-1.1.2/debian/watch --- remmina-1.1.2/debian/watch 2015-04-26 15:15:41.000000000 +0000 +++ remmina-1.1.2/debian/watch 2015-10-02 13:03:54.000000000 +0000 @@ -1,4 +1,4 @@ version=3 opts=uversionmangle=s/^(\S+-rcgit)/0.0.$1/ \ https://github.com/FreeRDP/Remmina/releases \ -.*[^n]/(?:|v|version-|release-|r|REL_|rel-|remmina(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) +.*[^n]/(?:|v|version-|version|release-|r|REL_|rel-|remmina(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)