diff -Nru remmina-1.1.2/debian/changelog remmina-1.1.2/debian/changelog --- remmina-1.1.2/debian/changelog 2015-10-02 15:08:25.000000000 +0200 +++ remmina-1.1.2/debian/changelog 2016-03-15 18:27:36.000000000 +0100 @@ -1,3 +1,18 @@ +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 ] @@ -21,6 +36,33 @@ -- Jörg Frings-Fürst Wed, 30 Sep 2015 19:15:27 +0200 +remmina (1.1.2-2ubuntu3) wily; urgency=medium + + * debian/control: + - Switch build depends from transitional libgnutsl28-dev to libgnutls-dev + + -- Robert Ancell Tue, 11 Aug 2015 11:36:46 +1200 + +remmina (1.1.2-2ubuntu2) wily; urgency=medium + + * No change rebuild for new libvncclient1 + + -- Micah Gersten Mon, 01 Jun 2015 23:09:12 -0500 + +remmina (1.1.2-2ubuntu1) wily; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + + debian/control: + - Build-depend on libappindicator3-dev, intltool + - Switch vte Build-Depends to 2.91 + + debian/rules: + - Build with libappindicator + - Call intltool-update on build + + debian/patches/translations.patch, + - Make translatable and add keywords. + + -- Iain Lane Mon, 18 May 2015 15:53:17 +0100 + remmina (1.1.2-2) unstable; urgency=medium * Upload to unstable. @@ -44,6 +86,28 @@ -- Luca Falavigna Thu, 20 Nov 2014 21:08:11 +0100 +remmina (1.1.1-1ubuntu1) vivid; urgency=low + + * Merge with Debian, remaining Ubuntu changes: (LP: #1358770) + + 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. + * Dropped changes: + - Add Breaks and Replaces from remmina to remmina-common as the .desktop + file has moved across. Not required any more as this more than one LTS + ago. + - Set keywords in desktop file to make searchable. Merged into + translations.patch. + - Add quick lists for the unity launcher. Upstream now. + Set a title so the unity-hud doesn't list as "untitled". Upstream now. + * Port to work with vte 2.91 + + -- Iain Lane Fri, 07 Nov 2014 16:17:53 +0000 + remmina (1.1.1-1) unstable; urgency=medium * New upstream release. @@ -124,6 +188,27 @@ -- Luca Falavigna Sun, 28 Sep 2014 10:10:16 +0200 +remmina (1.0.0-6ubuntu1) utopic; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: (LP: #1358770) + * debian/control: + - Build-depend on libappindicator3-dev, intltool + - Add Breaks and Replaces from remmina to remmina-common as the .desktop + file has moved across. + * debian/rules: + - Build with libappindicator + - Call intltool-update on build + * debian/patches/indicator_set_title.patch: + - Set a title so the unity-hud doesn't list as "untitled" + * debian/patches/translations.patch, + - Make translatable + * debian/patches/keywords.patch: + - Set keywords in desktop file to make searchable + * debian/patches/unity_launcher_list.patch: + - Add quick lists for the unity launcher + + -- Robert Ancell Tue, 02 Sep 2014 10:35:23 +1200 + remmina (1.0.0-6) unstable; urgency=low * Upload to unstable. @@ -169,6 +254,47 @@ -- Luca Falavigna Sun, 17 Mar 2013 14:37:39 +0100 +remmina (1.0.0-4ubuntu3) saucy; urgency=low + + * debian/patches/keywords.patch: update remmina.desktop as well, + the file is not updated during the build (lp: #1024480) + + -- Sebastien Bacher Mon, 15 Jul 2013 16:27:18 +0200 + +remmina (1.0.0-4ubuntu2) raring; urgency=low + + * Added missing libs to link, fixing FTBFS (LP: #1163798). + + -- Daniel T Chen Wed, 03 Apr 2013 12:12:04 -0400 + +remmina (1.0.0-4ubuntu1) raring; urgency=low + + [ Alex Chiang ] + * Merge from Debian unstable. + - Dropped in favor of upstream debian's patches: + . install_desktop_file.patch => desktop_file.patch + . scroll_smooth.patch => scroll.patch + . trayicon_option.patch => systray.patch + * Remaining changes: + - debian/patches/indicator_set_title.patch: + . set a title so the unity-hud doesn't list as "untitled" (lp: #943434) + - debian/patches/translations.patch, + debian/rules: + . improve translation support, add a .desktop.in, update potfiles.in + lists, call intltool-update on build (lp: #943279) + - debian/patches/keywords.patch: + . backport upstream patch to set keywords in the desktop entry, + it makes easier to find remmina in the unity dash or gnome-shell + (lp: #1024480) + - debian/patches/unity_launcher_list.patch: unity launcher list support + thanks Nekhelesh Ramananthan (lp: #938026) + + [ Iain Lane ] + * Add Breaks and Replaces from remmina to remmina-common as the .desktop + file has moved across. + + -- Alex Chiang Thu, 17 Jan 2013 16:31:24 +0000 + remmina (1.0.0-4) unstable; urgency=low [ Martijn van Brummelen ] @@ -216,6 +342,72 @@ -- Luca Falavigna Sat, 25 Feb 2012 01:21:41 +0100 +remmina (1.0.0-1ubuntu8) quantal; urgency=low + + * debian/patches/09_keywords.patch: + - backport upstream patch to set keywords in the desktop entry, + it makes easier to find remmina in the unity dash or gnome-shell + (lp: #1024480) + + -- Sebastien Bacher Fri, 27 Jul 2012 16:57:29 +0200 + +remmina (1.0.0-1ubuntu6.1) precise-proposed; urgency=low + + * debian/patches/clipboard.patch: add clipboard support. + (LP: #937522) + + -- Jean-Louis Dupond Tue, 08 May 2012 20:50:11 +0200 + +remmina (1.0.0-1ubuntu6) precise-proposed; urgency=low + + * debian/patches/scroll_smooth.patch: fix scrolling with GDK_SCROLL_SMOOTH + (LP: #952964). + + -- Jean-Louis Dupond Sun, 22 Apr 2012 23:10:05 +0200 + +remmina (1.0.0-1ubuntu5) precise; urgency=low + + * debian/control: build-depends on intltool + * debian/patches/translations.patch: set the gettext domain as well + + -- Sebastien Bacher Thu, 22 Mar 2012 12:41:23 +0100 + +remmina (1.0.0-1ubuntu4) precise; urgency=low + + * debian/patches/translations.patch, + debian/rules: + - improve translation support, add a .desktop.in, update potfiles.in + lists, call intltool-update on build (lp: #943279) + + -- Sebastien Bacher Thu, 22 Mar 2012 11:44:52 +0100 + +remmina (1.0.0-1ubuntu3) precise; urgency=low + + * debian/patches/unity_launcher_list.patch: unity launcher list support + thanks Nekhelesh Ramananthan (lp: #938026) + + -- Sebastien Bacher Thu, 01 Mar 2012 22:45:29 +0100 + +remmina (1.0.0-1ubuntu2) precise; urgency=low + + * debian/control: + - updated libappindicator requirement + * debian/patches/indicator_set_title.patch: + - set a title so the unity-hud doesn't list as "untitled" (lp: #943434) + + -- Sebastien Bacher Wed, 29 Feb 2012 18:53:46 +0100 + +remmina (1.0.0-1ubuntu1) precise; urgency=low + + * debian/control, debian/rules: Build with appindicator + support. (LP: #926619) + * debian/patches/trayicon_option.patch: Add -i option to + only start as a tray icon. + * debian/patches/install_desktop_file.patch: Add desktop file. + (LP: #931336) + + -- Whoopie Wed, 15 Feb 2012 13:27:09 +0100 + remmina (1.0.0-1) unstable; urgency=low * New upstream release. @@ -425,4 +617,3 @@ * Initial release (Closes: #537292). -- Luca Falavigna Tue, 25 Aug 2009 23:59:55 +0200 - diff -Nru remmina-1.1.2/debian/control remmina-1.1.2/debian/control --- remmina-1.1.2/debian/control 2015-10-02 15:07:55.000000000 +0200 +++ remmina-1.1.2/debian/control 2016-03-15 18:27:36.000000000 +0100 @@ -1,7 +1,8 @@ Source: remmina Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jörg Frings-Fürst Build-Depends: cmake (>= 2.8), debhelper (>= 9~), @@ -9,14 +10,16 @@ libfreerdp-dev (>= 1.1.0~), libgcrypt20-dev, libgnome-keyring-dev, - libgnutls28-dev, + libgnutls-dev, libgtk-3-dev, libjpeg-dev, libssh-dev (>= 0.4), libtelepathy-glib-dev, libvncserver-dev, libvte-2.91-dev, - libxkbfile-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 diff -Nru remmina-1.1.2/debian/patches/series remmina-1.1.2/debian/patches/series --- remmina-1.1.2/debian/patches/series 2015-10-02 15:03:54.000000000 +0200 +++ remmina-1.1.2/debian/patches/series 2016-03-15 18:27:50.000000000 +0100 @@ -1,2 +1,3 @@ -0005-desktop.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 1970-01-01 01:00:00.000000000 +0100 +++ remmina-1.1.2/debian/patches/translations.patch 2016-03-15 18:32:24.000000000 +0100 @@ -0,0 +1,151 @@ +Description: Make translatable +Ubuntu: https://launchpad.net/bugs/943279 + +Index: b/remmina/desktop/remmina.desktop.in +=================================================================== +--- /dev/null ++++ b/remmina/desktop/remmina.desktop.in +@@ -0,0 +1,22 @@ ++[Desktop Entry] ++Version=1.0 ++_Name=Remmina ++_GenericName=Remote Desktop Client ++_X-GNOME-FullName=Remmina Remote Desktop Client ++_Comment=Connect to remote desktops ++TryExec=remmina ++Exec=remmina ++Icon=remmina ++Terminal=false ++Type=Application ++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 ++Exec=remmina --new ++ ++[Desktop Action Tray] ++_Name=Start Remmina Minimized ++Exec=remmina --icon +Index: b/remmina/desktop/remmina.desktop +=================================================================== +--- a/remmina/desktop/remmina.desktop ++++ b/remmina/desktop/remmina.desktop +@@ -72,6 +72,8 @@ + Type=Application + Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; + Actions=Profile;Tray; ++Keywords=remote desktop;rdp;vnc;nx,ssh;VNC;XDMCP;RDP; ++X-Ubuntu-Gettext-Domain=remmina + + [Desktop Action Profile] + Name=Create a New Connection Profile +Index: b/remmina/po/POTFILES.in +=================================================================== +--- a/remmina/po/POTFILES.in ++++ b/remmina/po/POTFILES.in +@@ -1,52 +1,51 @@ +-remmina/desktop/remmina.desktop.in.h +-remmina/src/remmina_widget_pool.c +-remmina/src/remmina_key_chooser.c +-remmina/src/remmina_string_list.c +-remmina/src/remmina_external_tools.c +-remmina/src/remmina_scaler.c +-remmina/src/remmina_pref_dialog.c +-remmina/src/remmina_file_manager.c +-remmina/src/remmina_string_array.c +-remmina/src/remmina_applet_menu.c +-remmina/src/remmina_file_editor.c +-remmina/src/remmina_about.c +-remmina/src/remmina_file.c +-remmina/src/remmina_chat_window.c +-remmina/src/remmina_crypt.c +-remmina/src/remmina_marshals.c +-remmina/src/remmina_public.c +-remmina/src/remmina_ftp_client.c +-remmina/src/remmina_ssh.c +-remmina/src/remmina_pref.c +-remmina/src/remmina_applet_menu_item.c +-remmina/src/remmina_log.c +-remmina/src/remmina_plugin_manager.c +-remmina/src/remmina_chain_button.c +-remmina/src/remmina_ssh_plugin.c +-remmina/src/remmina_main.c +-remmina/src/remmina_sftp_plugin.c +-remmina/src/remmina_sftp_client.c +-remmina/src/remmina_protocol_widget.c +-remmina/src/remmina_scrolled_viewport.c +-remmina/src/remmina_icon.c +-remmina/src/remmina_exec.c +-remmina/src/remmina.c +-remmina/src/remmina_avahi.c +-remmina/src/remmina_init_dialog.c +-remmina/src/remmina_connection_window.c +-remmina-plugins/vnc/vnc_plugin.c +-remmina-plugins/rdp/rdp_plugin.c +-remmina-plugins/rdp/rdp_file.c +-remmina-plugins/rdp/rdp_gdi.c +-remmina-plugins/rdp/rdp_settings.c +-remmina-plugins/rdp/rdp_event.c +-remmina-plugins/rdp/rdp_cliprdr.c +-remmina-plugins/rdp/rdp_graphics.c +-remmina-plugins/telepathy/telepathy_handler.c +-remmina-plugins/telepathy/telepathy_channel_handler.c +-remmina-plugins/telepathy/telepathy_plugin.c +-remmina-plugins/nx/nx_session_manager.c +-remmina-plugins/nx/nx_plugin.c +-remmina-plugins/nx/nx_session.c +-remmina-plugins/xdmcp/xdmcp_plugin.c +-remmina-plugins-gnome/src/gkeyring_plugin.c ++src/remmina_widget_pool.c ++src/remmina_key_chooser.c ++src/remmina_string_list.c ++src/remmina_external_tools.c ++src/remmina_scaler.c ++src/remmina_pref_dialog.c ++src/remmina_file_manager.c ++src/remmina_string_array.c ++src/remmina_applet_menu.c ++src/remmina_file_editor.c ++src/remmina_about.c ++src/remmina_file.c ++src/remmina_chat_window.c ++src/remmina_crypt.c ++src/remmina_marshals.c ++src/remmina_public.c ++src/remmina_ftp_client.c ++src/remmina_ssh.c ++src/remmina_pref.c ++src/remmina_applet_menu_item.c ++src/remmina_log.c ++src/remmina_plugin_manager.c ++src/remmina_chain_button.c ++src/remmina_ssh_plugin.c ++src/remmina_main.c ++src/remmina_sftp_plugin.c ++src/remmina_sftp_client.c ++src/remmina_protocol_widget.c ++src/remmina_scrolled_viewport.c ++src/remmina_icon.c ++src/remmina_exec.c ++src/remmina.c ++src/remmina_avahi.c ++src/remmina_init_dialog.c ++src/remmina_connection_window.c ++../remmina-plugins/vnc/vnc_plugin.c ++../remmina-plugins/rdp/rdp_plugin.c ++../remmina-plugins/rdp/rdp_file.c ++../remmina-plugins/rdp/rdp_gdi.c ++../remmina-plugins/rdp/rdp_settings.c ++../remmina-plugins/rdp/rdp_event.c ++../remmina-plugins/rdp/rdp_cliprdr.c ++../remmina-plugins/rdp/rdp_graphics.c ++../remmina-plugins/telepathy/telepathy_handler.c ++../remmina-plugins/telepathy/telepathy_channel_handler.c ++../remmina-plugins/telepathy/telepathy_plugin.c ++../remmina-plugins/nx/nx_session_manager.c ++../remmina-plugins/nx/nx_plugin.c ++../remmina-plugins/nx/nx_session.c ++../remmina-plugins/xdmcp/xdmcp_plugin.c ++../remmina-plugins-gnome/src/gkeyring_plugin.c diff -Nru remmina-1.1.2/debian/rules remmina-1.1.2/debian/rules --- remmina-1.1.2/debian/rules 2015-10-02 15:03:54.000000000 +0200 +++ remmina-1.1.2/debian/rules 2016-03-15 18:27:36.000000000 +0100 @@ -5,14 +5,16 @@ %: dh $@ --dbg-package=remmina-dbg -override_dh_auto_configure: - dh_auto_configure -- -DWITH_APPINDICATOR=OFF - override_dh_install: dh_install + cd remmina/po; intltool-update --pot --verbose -g remmina [ -d debian/remmina-common ] && \ find $(CURDIR)/debian/remmina-common -name "*remmina.desktop" -delete && \ find $(CURDIR)/debian/remmina-common -type d -empty -delete || true override_dh_installchangelogs: dh_installchangelogs ChangeLog + +override_dh_clean: + -rm remmina/po/remmina.pot + dh_clean