diff -Nru remmina-1.0.0/debian/changelog remmina-1.0.0/debian/changelog --- remmina-1.0.0/debian/changelog 2012-05-24 13:37:17.000000000 -0700 +++ remmina-1.0.0/debian/changelog 2012-12-24 11:40:06.000000000 -0800 @@ -1,3 +1,26 @@ +remmina (1.0.0-4ubuntu1) raring; urgency=low + + * 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) + + -- Alex Chiang Sun, 23 Dec 2012 15:52:25 -0800 + remmina (1.0.0-4) unstable; urgency=low [ Martijn van Brummelen ] @@ -45,6 +68,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. diff -Nru remmina-1.0.0/debian/control remmina-1.0.0/debian/control --- remmina-1.0.0/debian/control 2012-05-24 13:37:17.000000000 -0700 +++ remmina-1.0.0/debian/control 2012-12-23 12:57:40.000000000 -0800 @@ -1,7 +1,8 @@ Source: remmina Section: gnome Priority: optional -Maintainer: Luca Falavigna +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Luca Falavigna Uploaders: Jean-Louis Dupond Build-Depends: debhelper (>= 9~), cmake (>= 2.6), @@ -16,7 +17,9 @@ libgnutls-dev, libgnome-keyring-dev, libavahi-ui-gtk3-dev (>= 0.6.0), - libvncserver-dev + libvncserver-dev, + libappindicator3-dev, + intltool Standards-Version: 3.9.3 Homepage: http://remmina.sourceforge.net/ Vcs-Git: git://git.debian.org/git/collab-maint/remmina.git diff -Nru remmina-1.0.0/debian/patches/indicator_set_title.patch remmina-1.0.0/debian/patches/indicator_set_title.patch --- remmina-1.0.0/debian/patches/indicator_set_title.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/indicator_set_title.patch 2012-04-24 18:17:28.000000000 -0700 @@ -0,0 +1,12 @@ +Index: remmina-1.0.0/remmina/src/remmina_icon.c +=================================================================== +--- remmina-1.0.0.orig/remmina/src/remmina_icon.c 2012-02-29 18:48:07.951328420 +0100 ++++ remmina-1.0.0/remmina/src/remmina_icon.c 2012-02-29 18:51:37.895338581 +0100 +@@ -396,6 +396,7 @@ + remmina_icon.icon = app_indicator_new ("remmina-icon", "remmina", APP_INDICATOR_CATEGORY_OTHER); + + 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.0.0/debian/patches/keywords.patch remmina-1.0.0/debian/patches/keywords.patch --- remmina-1.0.0/debian/patches/keywords.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/keywords.patch 2012-12-24 11:40:42.000000000 -0800 @@ -0,0 +1,12 @@ +Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in +=================================================================== +--- remmina-1.0.0-4ubuntu1.orig/remmina/desktop/remmina.desktop.in 2012-12-24 11:39:04.428741465 -0800 ++++ remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in 2012-12-24 11:40:39.933215048 -0800 +@@ -12,6 +12,7 @@ + Actions= + Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; + Actions=Profile;Tray; ++_Keywords=VNC;XDMCP;RDP; + + [Desktop Action Profile] + _Name=Create a New Connection Profile diff -Nru remmina-1.0.0/debian/patches/series remmina-1.0.0/debian/patches/series --- remmina-1.0.0/debian/patches/series 2012-05-24 13:37:17.000000000 -0700 +++ remmina-1.0.0/debian/patches/series 2012-12-24 11:40:37.000000000 -0800 @@ -1,3 +1,4 @@ +indicator_set_title.patch libvncserver.patch g_thread_init.patch desktop_file.patch @@ -7,3 +8,6 @@ fullname.patch systray.patch scroll.patch +unity_launcher_list.patch +translations.patch +keywords.patch diff -Nru remmina-1.0.0/debian/patches/translations.patch remmina-1.0.0/debian/patches/translations.patch --- remmina-1.0.0/debian/patches/translations.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/translations.patch 2012-12-24 11:39:00.000000000 -0800 @@ -0,0 +1,102 @@ +Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in 2012-12-23 14:43:08.743890098 -0800 +@@ -0,0 +1,25 @@ ++[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= ++Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; ++Actions=Profile;Tray; ++ ++[Desktop Action Profile] ++_Name=Create a New Connection Profile ++Exec=remmina --new ++OnlyShowIn=Unity; ++ ++[Desktop Action Tray] ++_Name=Start Remmina Minimized ++Exec=remmina --icon ++OnlyShowIn=Unity; ++ +Index: remmina-1.0.0-4ubuntu1/remmina/po/POTFILES.in +=================================================================== +--- remmina-1.0.0-4ubuntu1.orig/remmina/po/POTFILES.in 2012-12-23 14:38:34.830531831 -0800 ++++ remmina-1.0.0-4ubuntu1/remmina/po/POTFILES.in 2012-12-23 14:38:50.966611835 -0800 +@@ -1,27 +1,29 @@ + desktop/remmina.desktop.in +-src/remmina.c +-src/remminamain.c +-src/remminapublic.c +-src/remminafile.c +-src/remminafilemanager.c +-src/remminafileeditor.c +-src/remminaconnectionwindow.c +-src/remminaprotocolwidget.c +-src/remminainitdialog.c +-src/remminaabout.c +-src/remminapref.c +-src/remminastringlist.c +-src/remminaprefdialog.c +-src/remminassh.c +-src/remminasshplugin.c +-src/remminachatwindow.c +-src/remminaftpclient.c +-src/remminasftpclient.c +-src/remminasftpplugin.c +-src/remminascaler.c +-src/remminapluginmanager.c +-src/remminalog.c +-src/remminakeychooser.c +-src/remminaexec.c +-src/remminaicon.c +-src/remminaappletmenuitem.c ++src/remmina_about.c ++src/remmina_applet_menu_item.c ++src/remmina_chat_window.c ++src/remmina_connection_window.c ++src/remmina_exec.c ++src/remmina_file_editor.c ++src/remmina_ftp_client.c ++src/remmina_icon.c ++src/remmina_init_dialog.c ++src/remmina_key_chooser.c ++src/remmina_main.c ++src/remmina_plugin_manager.c ++src/remmina_pref_dialog.c ++src/remmina_protocol_widget.c ++src/remmina_scaler.c ++src/remmina_sftp_client.c ++src/remmina_sftp_plugin.c ++src/remmina_ssh.c ++src/remmina_ssh_plugin.c ++../remmina-plugins/nx/nx_plugin.c ++../remmina-plugins/nx/nx_session_manager.c ++../remmina-plugins/rdp/rdp_plugin.c ++../remmina-plugins/rdp/rdp_settings.c ++../remmina-plugins/telepathy/telepathy_channel_handler.c ++../remmina-plugins/telepathy/telepathy_plugin.c ++../remmina-plugins/vnc/vnc_plugin.c ++../remmina-plugins/xdmcp/xdmcp_plugin.c ++ +Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop +=================================================================== +--- remmina-1.0.0-4ubuntu1.orig/remmina/desktop/remmina.desktop 2012-12-23 14:38:34.810531724 -0800 ++++ remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop 2012-12-23 14:38:50.966611835 -0800 +@@ -12,6 +12,7 @@ + Actions= + Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; + Actions=Profile;Tray; ++X-Ubuntu-Gettext-Domain=remmina + + [Desktop Action Profile] + Name=Create a New Connection Profile diff -Nru remmina-1.0.0/debian/patches/unity_launcher_list.patch remmina-1.0.0/debian/patches/unity_launcher_list.patch --- remmina-1.0.0/debian/patches/unity_launcher_list.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/unity_launcher_list.patch 2012-12-23 14:17:42.000000000 -0800 @@ -0,0 +1,23 @@ +# Description: list for the unity launcher +# Ubuntu: https://launchpad.net/bugs/938026 +# Upstream: https://github.com/FreeRDP/Remmina/commits/master +=== modified file 'remmina/remmina/desktop/remmina.desktop' +Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop +=================================================================== +--- remmina-1.0.0-4ubuntu1.orig/remmina/desktop/remmina.desktop 2012-12-23 14:11:58.000000000 -0800 ++++ remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop 2012-12-23 14:17:31.524267461 -0800 +@@ -11,3 +11,14 @@ + Type=Application + Actions= + Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; ++Actions=Profile;Tray; ++ ++[Desktop Action Profile] ++Name=Create a New Connection Profile ++Exec=remmina --new ++OnlyShowIn=Unity; ++ ++[Desktop Action Tray] ++Name=Start Remmina Minimized ++Exec=remmina --icon ++OnlyShowIn=Unity; diff -Nru remmina-1.0.0/debian/rules remmina-1.0.0/debian/rules --- remmina-1.0.0/debian/rules 2012-05-24 13:37:17.000000000 -0700 +++ remmina-1.0.0/debian/rules 2012-12-23 13:20:25.000000000 -0800 @@ -3,11 +3,9 @@ %: dh $@ -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 @@ -16,3 +14,7 @@ for plugin in rdp vnc xdmcp nx telepathy; do \ dh_makeshlibs -premmina-plugin-$$plugin -Xremmina-plugin-$$plugin.so; \ done + +override_dh_clean: + -rm remmina/po/remmina.pot + dh_clean