diff -Nru remmina-1.0.0/debian/changelog remmina-1.0.0/debian/changelog --- remmina-1.0.0/debian/changelog 2012-07-27 08:22:57.000000000 -0700 +++ remmina-1.0.0/debian/changelog 2012-12-24 11:40:06.000000000 -0800 @@ -1,3 +1,73 @@ +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 ] + * debian/patches/clipboard.patch: + - Clipboard support (Closes: #659755). + + [ Luca Falavigna ] + * debian/patches/fullname.patch: + - Use X-GNOME-FullName in .desktop file (Closes: #625939). + * debian/patches/scroll.patch: + - Fix some issues with scrolling (Closes: #670535). + * debian/patches/systray.patch: + - Implement --icon/-i option (Closes: #661893). + * debian/control: + - Add dbus-x11 to remmina Depends field (Closes: #668018). + - Add Jean-Louis to Uploaders field. + - Move VCS repository under collab-maint. + + -- Luca Falavigna Thu, 24 May 2012 22:37:09 +0200 + +remmina (1.0.0-3) unstable; urgency=low + + * debian/patches/desktop_file.patch: + - Fix installation path of the desktop file. + * debian/rules: + - Check for existence of remmina-common directory before trying + to access it, fix FTBFS. + + -- Luca Falavigna Sat, 25 Feb 2012 10:16:51 +0100 + +remmina (1.0.0-2) unstable; urgency=low + + * debian/patches/desktop_file.patch: + - Restore installation of the .desktop file (Closes: #659542). + * debian/patches/toolbar.patch: + - Mark main toolbar as a primary toolbar (Closes: #659781). + * debian/patches/datadir.patch: + - Adjust location of REMMINA_DATADIR to allow install of icons + in the correct location. + * debian/control: + - Improve description of the remmina-plugin-gnome package. + - Bump Standards-Version to 3.9.3. + * debian/copyright: + - Format now points to copyright-format site. + + -- Luca Falavigna Sat, 25 Feb 2012 01:21:41 +0100 + remmina (1.0.0-1ubuntu8) quantal; urgency=low * debian/patches/09_keywords.patch: diff -Nru remmina-1.0.0/debian/control remmina-1.0.0/debian/control --- remmina-1.0.0/debian/control 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/control 2012-12-23 12:57:40.000000000 -0800 @@ -3,6 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Luca Falavigna +Uploaders: Jean-Louis Dupond Build-Depends: debhelper (>= 9~), cmake (>= 2.6), libgtk-3-dev, @@ -19,16 +20,17 @@ libvncserver-dev, libappindicator3-dev, intltool -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://remmina.sourceforge.net/ -Vcs-Git: git://git.debian.org/git/users/dktrkranz/remmina.git -Vcs-Browser: http://git.debian.org/?p=users/dktrkranz/remmina.git;a=summary +Vcs-Git: git://git.debian.org/git/collab-maint/remmina.git +Vcs-Browser: http://git.debian.org/git/collab-maint/remmina.git Package: remmina Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - remmina-common (= ${source:Version}) + remmina-common (= ${source:Version}), + dbus-x11 Recommends: remmina-plugin-rdp, remmina-plugin-vnc Breaks: remmina-plugin-data (<= 0.9) @@ -121,4 +123,5 @@ Remmina is a remote desktop connection client able to display and control a remote desktop session. . - This package contains the GNOME plugin for Remmina. + This package contains the GNOME Keyring plugin for Remmina, which allows one + to store and retrieve passwords from GNOME Keyring. diff -Nru remmina-1.0.0/debian/copyright remmina-1.0.0/debian/copyright --- remmina-1.0.0/debian/copyright 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/copyright 2012-08-03 04:53:29.000000000 -0700 @@ -1,4 +1,4 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: remmina Upstream-Contact: Vic Lee Source: http://remmina.sourceforge.net diff -Nru remmina-1.0.0/debian/install remmina-1.0.0/debian/install --- remmina-1.0.0/debian/install 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/install 2012-08-03 04:53:29.000000000 -0700 @@ -1 +1,2 @@ usr/bin +usr/share/applications diff -Nru remmina-1.0.0/debian/patches/clipboard.patch remmina-1.0.0/debian/patches/clipboard.patch --- remmina-1.0.0/debian/patches/clipboard.patch 2012-05-21 01:37:58.000000000 -0700 +++ remmina-1.0.0/debian/patches/clipboard.patch 2012-05-24 13:37:17.000000000 -0700 @@ -1,5 +1,10 @@ ---- /dev/null -+++ remmina-1.0.0/remmina-plugins/rdp/rdp_cliprdr.h +Description: Clipboard support +Author: Jean-Louis Dupond + +Index: b/remmina-plugins/rdp/rdp_cliprdr.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/remmina-plugins/rdp/rdp_cliprdr.h 2012-05-24 21:27:36.538073783 +0200 @@ -0,0 +1,33 @@ +/* + * Remmina - The GTK+ Remote Desktop Client @@ -34,9 +39,11 @@ +G_END_DECLS + +#endif ---- remmina-1.0.0.orig/remmina-plugins/rdp/CMakeLists.txt -+++ remmina-1.0.0/remmina-plugins/rdp/CMakeLists.txt -@@ -33,6 +33,8 @@ set(REMMINA_PLUGIN_RDP_SRCS +Index: b/remmina-plugins/rdp/CMakeLists.txt +=================================================================== +--- a/remmina-plugins/rdp/CMakeLists.txt 2012-05-24 21:24:24.200364889 +0200 ++++ b/remmina-plugins/rdp/CMakeLists.txt 2012-05-24 21:27:36.538073783 +0200 +@@ -33,6 +33,8 @@ rdp_gdi.h rdp_graphics.c rdp_graphics.h @@ -45,9 +52,11 @@ ) add_library(remmina-plugin-rdp ${REMMINA_PLUGIN_RDP_SRCS}) ---- remmina-1.0.0.orig/remmina-plugins/rdp/rdp_event.c -+++ remmina-1.0.0/remmina-plugins/rdp/rdp_event.c -@@ -461,6 +461,16 @@ static gboolean remmina_rdp_event_on_key +Index: b/remmina-plugins/rdp/rdp_event.c +=================================================================== +--- a/remmina-plugins/rdp/rdp_event.c 2012-05-24 21:24:24.200364889 +0200 ++++ b/remmina-plugins/rdp/rdp_event.c 2012-05-24 21:27:36.538073783 +0200 +@@ -452,6 +452,16 @@ return TRUE; } @@ -64,7 +73,7 @@ void remmina_rdp_event_init(RemminaProtocolWidget* gp) { gint n; -@@ -470,6 +480,7 @@ void remmina_rdp_event_init(RemminaProto +@@ -461,6 +471,7 @@ XPixmapFormatValues* pf; XPixmapFormatValues* pfs; rfContext* rfi; @@ -72,7 +81,7 @@ rfi = GET_DATA(gp); rfi->drawing_area = gtk_drawing_area_new(); -@@ -508,6 +519,13 @@ void remmina_rdp_event_init(RemminaProto +@@ -499,6 +510,13 @@ g_signal_connect(G_OBJECT(rfi->drawing_area), "key-release-event", G_CALLBACK(remmina_rdp_event_on_key), gp); @@ -86,7 +95,7 @@ rfi->pressed_keys = g_array_new(FALSE, TRUE, sizeof (gint)); rfi->event_queue = g_async_queue_new_full(g_free); rfi->ui_queue = g_async_queue_new(); -@@ -556,6 +574,13 @@ void remmina_rdp_event_uninit(RemminaPro +@@ -547,6 +565,13 @@ rfi = GET_DATA(gp); @@ -100,8 +109,10 @@ if (rfi->scale_handler) { g_source_remove(rfi->scale_handler); ---- remmina-1.0.0.orig/remmina-plugins/rdp/rdp_plugin.c -+++ remmina-1.0.0/remmina-plugins/rdp/rdp_plugin.c +Index: b/remmina-plugins/rdp/rdp_plugin.c +=================================================================== +--- a/remmina-plugins/rdp/rdp_plugin.c 2012-05-24 21:24:24.204362890 +0200 ++++ b/remmina-plugins/rdp/rdp_plugin.c 2012-05-24 21:27:36.538073783 +0200 @@ -24,6 +24,7 @@ #include "rdp_graphics.h" #include "rdp_file.h" @@ -118,7 +129,7 @@ #define REMMINA_RDP_FEATURE_TOOL_REFRESH 1 #define REMMINA_RDP_FEATURE_SCALE 2 -@@ -155,6 +157,14 @@ boolean rf_check_fds(RemminaProtocolWidg +@@ -155,6 +157,14 @@ input->MouseEvent(input, event->mouse_event.flags, event->mouse_event.x, event->mouse_event.y); break; @@ -133,7 +144,7 @@ } g_free(event); -@@ -545,6 +556,7 @@ static void remmina_rdp_main_loop(Remmin +@@ -545,6 +555,7 @@ fd_set rfds_set; fd_set wfds_set; rfContext* rfi; @@ -141,7 +152,7 @@ memset(rfds, 0, sizeof(rfds)); memset(wfds, 0, sizeof(wfds)); -@@ -618,6 +630,12 @@ static void remmina_rdp_main_loop(Remmin +@@ -618,6 +629,12 @@ { break; } @@ -154,8 +165,10 @@ /* check ui */ if (!rf_check_fds(gp)) { ---- /dev/null -+++ remmina-1.0.0/remmina-plugins/rdp/rdp_cliprdr.c +Index: b/remmina-plugins/rdp/rdp_cliprdr.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/remmina-plugins/rdp/rdp_cliprdr.c 2012-05-24 21:27:36.538073783 +0200 @@ -0,0 +1,450 @@ +/* + * Remmina - The GTK+ Remote Desktop Client @@ -607,9 +620,11 @@ + } + } +} ---- remmina-1.0.0.orig/remmina-plugins/rdp/rdp_plugin.h -+++ remmina-1.0.0/remmina-plugins/rdp/rdp_plugin.h -@@ -133,12 +133,17 @@ struct rf_context +Index: b/remmina-plugins/rdp/rdp_plugin.h +=================================================================== +--- a/remmina-plugins/rdp/rdp_plugin.h 2012-05-24 21:24:24.204362890 +0200 ++++ b/remmina-plugins/rdp/rdp_plugin.h 2012-05-24 21:27:36.542073783 +0200 +@@ -133,12 +133,17 @@ GArray* pressed_keys; GAsyncQueue* event_queue; gint event_pipe[2]; diff -Nru remmina-1.0.0/debian/patches/datadir.patch remmina-1.0.0/debian/patches/datadir.patch --- remmina-1.0.0/debian/patches/datadir.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/datadir.patch 2012-05-24 13:37:17.000000000 -0700 @@ -0,0 +1,16 @@ +Description: Adjust location of REMMINA_DATADIR +Author: Luca Falavigna + +Index: remmina/CMakeLists.txt +=================================================================== +--- remmina.orig/CMakeLists.txt 2012-02-25 01:19:12.786148529 +0100 ++++ remmina/CMakeLists.txt 2012-02-25 01:19:21.306148791 +0100 +@@ -78,7 +78,7 @@ + include_directories(remmina/include) + + set(REMMINA_VERSION "0.9.99.1") +-set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina") ++set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share") + set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale") + set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins") + diff -Nru remmina-1.0.0/debian/patches/desktop_file.patch remmina-1.0.0/debian/patches/desktop_file.patch --- remmina-1.0.0/debian/patches/desktop_file.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/desktop_file.patch 2012-05-24 13:37:17.000000000 -0700 @@ -0,0 +1,47 @@ +Description: Install .desktop file +Author: Jeremy Bicha +Bug: http://bugs.debian.org/659542 + +Index: remmina/remmina/desktop/CMakeLists.txt +=================================================================== +--- remmina.orig/remmina/desktop/CMakeLists.txt 2012-02-23 22:31:49.813792008 +0100 ++++ remmina/remmina/desktop/CMakeLists.txt 2012-02-23 22:32:25.425793099 +0100 +@@ -38,3 +38,4 @@ + install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR}) + install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR}) + ++install(FILES remmina.desktop DESTINATION share/applications) +Index: remmina/remmina/desktop/remmina.desktop +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ remmina/remmina/desktop/remmina.desktop 2012-02-23 22:31:18.685791053 +0100 +@@ -0,0 +1,12 @@ ++[Desktop Entry] ++Version=1.0 ++Name=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; ++ +Index: remmina/remmina/desktop/remmina.desktop.in +=================================================================== +--- remmina.orig/remmina/desktop/remmina.desktop.in 2012-02-23 22:31:18.685791053 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,12 +0,0 @@ +-[Desktop Entry] +-Version=1.0 +-_Name=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; +- diff -Nru remmina-1.0.0/debian/patches/fullname.patch remmina-1.0.0/debian/patches/fullname.patch --- remmina-1.0.0/debian/patches/fullname.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/fullname.patch 2012-05-24 13:37:17.000000000 -0700 @@ -0,0 +1,22 @@ +Description: Use X-GNOME-FullName in .desktop file +Author: Luca Falavigna + +Index: remmina/remmina/desktop/remmina.desktop +=================================================================== +--- remmina.orig/remmina/desktop/remmina.desktop 2012-05-24 21:33:31.762084665 +0200 ++++ remmina/remmina/desktop/remmina.desktop 2012-05-24 21:34:30.650086470 +0200 +@@ -1,6 +1,8 @@ + [Desktop Entry] + Version=1.0 +-Name=Remmina Remote Desktop Client ++Name=Remmina ++GenericName=Remote Desktop Client ++X-GNOME-FullName=Remmina Remote Desktop Client + Comment=Connect to remote desktops + TryExec=remmina + Exec=remmina +@@ -9,4 +11,3 @@ + Type=Application + Actions= + Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; +- diff -Nru remmina-1.0.0/debian/patches/install_desktop_file.patch remmina-1.0.0/debian/patches/install_desktop_file.patch --- remmina-1.0.0/debian/patches/install_desktop_file.patch 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/patches/install_desktop_file.patch 1969-12-31 16:00:00.000000000 -0800 @@ -1,52 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2012-02-21 09:59:31.607253623 +0100 -+++ b/CMakeLists.txt 2012-02-21 10:04:52.321444577 +0100 -@@ -78,7 +78,7 @@ - include_directories(remmina/include) - - set(REMMINA_VERSION "0.9.99.1") --set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina") -+set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share") - set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale") - set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins") - -diff -Naur a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt ---- a/remmina/desktop/CMakeLists.txt 2012-02-21 09:59:31.611251572 +0100 -+++ b/remmina/desktop/CMakeLists.txt 2012-02-21 10:04:52.321444577 +0100 -@@ -38,3 +38,4 @@ - install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR}) - install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR}) - -+install(FILES remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications") -diff -Naur a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop ---- a/remmina/desktop/remmina.desktop 1970-01-01 01:00:00.000000000 +0100 -+++ b/remmina/desktop/remmina.desktop 2012-02-21 10:04:52.325444526 +0100 -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+Version=1.0 -+Name=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; -+ -diff -Naur a/remmina/desktop/remmina.desktop.in b/remmina/desktop/remmina.desktop.in ---- a/remmina/desktop/remmina.desktop.in 2012-02-21 09:59:31.611251572 +0100 -+++ b/remmina/desktop/remmina.desktop.in 1970-01-01 01:00:00.000000000 +0100 -@@ -1,12 +0,0 @@ --[Desktop Entry] --Version=1.0 --_Name=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; -- 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 2012-07-27 08:17:25.000000000 -0700 +++ remmina-1.0.0/debian/patches/keywords.patch 2012-12-24 11:40:42.000000000 -0800 @@ -1,8 +1,8 @@ -Index: remmina-1.0.0/remmina/desktop/remmina.desktop.in +Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in =================================================================== ---- remmina-1.0.0.orig/remmina/desktop/remmina.desktop.in 2012-07-27 17:15:44.376892231 +0200 -+++ remmina-1.0.0/remmina/desktop/remmina.desktop.in 2012-07-27 17:17:20.527001886 +0200 -@@ -10,6 +10,7 @@ +--- 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; diff -Nru remmina-1.0.0/debian/patches/scroll.patch remmina-1.0.0/debian/patches/scroll.patch --- remmina-1.0.0/debian/patches/scroll.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/scroll.patch 2012-05-24 13:37:17.000000000 -0700 @@ -0,0 +1,95 @@ +Description: Fix some issues with scrolling +Author: Luca Falavigna + +Index: remmina/remmina-plugins/rdp/rdp_event.c +=================================================================== +--- remmina.orig/remmina-plugins/rdp/rdp_event.c 2012-05-24 21:48:37.814112422 +0200 ++++ remmina/remmina-plugins/rdp/rdp_event.c 2012-05-24 21:56:56.306127693 +0200 +@@ -377,6 +377,17 @@ + case GDK_SCROLL_DOWN: + flag = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; + break; ++ ++#ifdef GDK_SCROLL_SMOOTH ++ case GDK_SCROLL_SMOOTH: ++ if (event->delta_y < 0) ++ flag = PTR_FLAGS_WHEEL | 0x0078; ++ if (event->delta_y > 0) ++ flag = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; ++ if (!flag) ++ return FALSE; ++ break; ++#endif + + default: + return FALSE; +@@ -479,7 +490,7 @@ + gtk_container_add(GTK_CONTAINER(gp), rfi->drawing_area); + + gtk_widget_add_events(rfi->drawing_area, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK +- | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); ++ | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); + gtk_widget_set_can_focus(rfi->drawing_area, TRUE); + + remmina_plugin_service->protocol_plugin_register_hostkey(gp, rfi->drawing_area); +Index: remmina/remmina-plugins/vnc/vnc_plugin.c +=================================================================== +--- remmina.orig/remmina-plugins/vnc/vnc_plugin.c 2012-05-24 21:24:24.208360890 +0200 ++++ remmina/remmina-plugins/vnc/vnc_plugin.c 2012-05-24 21:56:56.310127694 +0200 +@@ -1426,6 +1426,20 @@ + case GDK_SCROLL_RIGHT: + mask = (1 << 6); + break; ++#ifdef GDK_SCROLL_SMOOTH ++ case GDK_SCROLL_SMOOTH: ++ if (event->delta_y < 0) ++ mask = (1 << 3); ++ if (event->delta_y > 0) ++ mask = (1 << 4); ++ if (event->delta_x < 0) ++ mask = (1 << 5); ++ if (event->delta_x > 0) ++ mask = (1 << 6); ++ if (!mask) ++ return FALSE; ++ break; ++#endif + default: + return FALSE; + } +@@ -1847,7 +1861,7 @@ + gtk_widget_add_events( + gpdata->drawing_area, + GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK +- | GDK_KEY_RELEASE_MASK); ++ | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); + gtk_widget_set_can_focus(gpdata->drawing_area, TRUE); + + #if GTK_VERSION == 3 +Index: remmina/remmina/src/remmina_connection_window.c +=================================================================== +--- remmina.orig/remmina/src/remmina_connection_window.c 2012-05-24 21:24:24.228350890 +0200 ++++ remmina/remmina/src/remmina_connection_window.c 2012-05-24 21:55:50.294125671 +0200 +@@ -1477,6 +1477,22 @@ + return TRUE; + } + break; ++#ifdef GDK_SCROLL_SMOOTH ++ case GDK_SCROLL_SMOOTH: ++ if (event->delta_y < 0 && opacity > 0) ++ { ++ remmina_file_set_int(cnnobj->remmina_file, "toolbar_opacity", opacity - 1); ++ remmina_connection_holder_update_toolbar_opacity(cnnhld); ++ return TRUE; ++ } ++ if (event->delta_y > 0 && opacity < TOOLBAR_OPACITY_LEVEL) ++ { ++ remmina_file_set_int(cnnobj->remmina_file, "toolbar_opacity", opacity + 1); ++ remmina_connection_holder_update_toolbar_opacity(cnnhld); ++ return TRUE; ++ } ++ break; ++#endif + default: + break; + } diff -Nru remmina-1.0.0/debian/patches/scroll_smooth.patch remmina-1.0.0/debian/patches/scroll_smooth.patch --- remmina-1.0.0/debian/patches/scroll_smooth.patch 2012-04-25 07:18:09.000000000 -0700 +++ remmina-1.0.0/debian/patches/scroll_smooth.patch 1969-12-31 16:00:00.000000000 -0800 @@ -1,89 +0,0 @@ -Description: fix scrolling in vnc & rdp plugin - - remmina (1.0.0-1ubuntu6) precise-proposed; urgency=low - . - * debian/patches/scroll_smooth.patch: fix scrolling with GDK_SCROLL_SMOOTH - (LP: #952964). -Author: Jean-Louis Dupond -Bug-Ubuntu: https://bugs.launchpad.net/bugs/952964 - ---- remmina-1.0.0.orig/remmina-plugins/rdp/rdp_event.c -+++ remmina-1.0.0/remmina-plugins/rdp/rdp_event.c -@@ -377,6 +377,15 @@ static gboolean remmina_rdp_event_on_scr - case GDK_SCROLL_DOWN: - flag = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; - break; -+ -+ case GDK_SCROLL_SMOOTH: -+ if (event->delta_y < 0) -+ flag = PTR_FLAGS_WHEEL | 0x0078; -+ if (event->delta_y > 0) -+ flag = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; -+ if (!flag) -+ return FALSE; -+ break; - - default: - return FALSE; -@@ -468,7 +477,7 @@ void remmina_rdp_event_init(RemminaProto - gtk_container_add(GTK_CONTAINER(gp), rfi->drawing_area); - - gtk_widget_add_events(rfi->drawing_area, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK -- | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); -+ | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); - gtk_widget_set_can_focus(rfi->drawing_area, TRUE); - - remmina_plugin_service->protocol_plugin_register_hostkey(gp, rfi->drawing_area); ---- remmina-1.0.0.orig/remmina-plugins/vnc/vnc_plugin.c -+++ remmina-1.0.0/remmina-plugins/vnc/vnc_plugin.c -@@ -1426,6 +1426,18 @@ static gboolean remmina_plugin_vnc_on_sc - case GDK_SCROLL_RIGHT: - mask = (1 << 6); - break; -+ case GDK_SCROLL_SMOOTH: -+ if (event->delta_y < 0) -+ mask = (1 << 3); -+ if (event->delta_y > 0) -+ mask = (1 << 4); -+ if (event->delta_x < 0) -+ mask = (1 << 5); -+ if (event->delta_x > 0) -+ mask = (1 << 6); -+ if (!mask) -+ return FALSE; -+ break; - default: - return FALSE; - } -@@ -1847,7 +1859,7 @@ static void remmina_plugin_vnc_init(Remm - gtk_widget_add_events( - gpdata->drawing_area, - GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK -- | GDK_KEY_RELEASE_MASK); -+ | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); - gtk_widget_set_can_focus(gpdata->drawing_area, TRUE); - - #if GTK_VERSION == 3 ---- remmina-1.0.0.orig/remmina/src/remmina_connection_window.c -+++ remmina-1.0.0/remmina/src/remmina_connection_window.c -@@ -1477,6 +1477,20 @@ static gboolean remmina_connection_holde - return TRUE; - } - break; -+ case GDK_SCROLL_SMOOTH: -+ if (event->delta_y < 0 && opacity > 0) -+ { -+ remmina_file_set_int(cnnobj->remmina_file, "toolbar_opacity", opacity - 1); -+ remmina_connection_holder_update_toolbar_opacity(cnnhld); -+ return TRUE; -+ } -+ if (event->delta_y > 0 && opacity < TOOLBAR_OPACITY_LEVEL) -+ { -+ remmina_file_set_int(cnnobj->remmina_file, "toolbar_opacity", opacity + 1); -+ remmina_connection_holder_update_toolbar_opacity(cnnhld); -+ return TRUE; -+ } -+ break; - default: - break; - } diff -Nru remmina-1.0.0/debian/patches/series remmina-1.0.0/debian/patches/series --- remmina-1.0.0/debian/patches/series 2012-07-27 08:17:15.000000000 -0700 +++ remmina-1.0.0/debian/patches/series 2012-12-24 11:40:37.000000000 -0800 @@ -1,10 +1,13 @@ indicator_set_title.patch libvncserver.patch g_thread_init.patch -trayicon_option.patch -install_desktop_file.patch +desktop_file.patch +toolbar.patch +datadir.patch +clipboard.patch +fullname.patch +systray.patch +scroll.patch unity_launcher_list.patch translations.patch -scroll_smooth.patch -clipboard.patch keywords.patch diff -Nru remmina-1.0.0/debian/patches/systray.patch remmina-1.0.0/debian/patches/systray.patch --- remmina-1.0.0/debian/patches/systray.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/systray.patch 2012-05-24 13:37:17.000000000 -0700 @@ -0,0 +1,43 @@ +Description: Implement --icon/-i option +Author: Rex Tsai + +Index: remmina/remmina/src/remmina.c +=================================================================== +--- remmina.orig/remmina/src/remmina.c 2012-05-24 21:38:18.710093456 +0200 ++++ remmina/remmina/src/remmina.c 2012-05-24 21:40:40.570097800 +0200 +@@ -55,6 +55,7 @@ + static gboolean remmina_option_quit; + static gchar *remmina_option_server; + static gchar *remmina_option_protocol; ++static gboolean remmina_option_icon; + + static GOptionEntry remmina_options[] = + { +@@ -68,6 +69,7 @@ + { "quit", 'q', 0, G_OPTION_ARG_NONE, &remmina_option_quit, "Quit the application", NULL }, + { "server", 's', 0, G_OPTION_ARG_STRING, &remmina_option_server, "Use default server name S", "S" }, + { "protocol", 't', 0, G_OPTION_ARG_STRING, &remmina_option_protocol, "Use default protocol T", "T" }, ++{ "icon", 'i', 0, G_OPTION_ARG_NONE, &remmina_option_icon, "Start as tray icon", NULL }, + { NULL } }; + + static gint remmina_on_command_line(GApplication *app, GApplicationCommandLine *cmdline) +@@ -90,6 +92,7 @@ + remmina_option_plugin = NULL; + remmina_option_server = NULL; + remmina_option_protocol = NULL; ++ remmina_option_icon = FALSE; + + argv = g_application_command_line_get_arguments(cmdline, &argc); + +@@ -157,6 +160,11 @@ + remmina_exec_command(REMMINA_COMMAND_PLUGIN, remmina_option_plugin); + executed = TRUE; + } ++ if (remmina_option_icon) ++ { ++ remmina_exec_command(REMMINA_COMMAND_NONE, remmina_option_icon); ++ executed = TRUE; ++ } + if (!executed) + { + remmina_exec_command(REMMINA_COMMAND_MAIN, NULL); diff -Nru remmina-1.0.0/debian/patches/toolbar.patch remmina-1.0.0/debian/patches/toolbar.patch --- remmina-1.0.0/debian/patches/toolbar.patch 1969-12-31 16:00:00.000000000 -0800 +++ remmina-1.0.0/debian/patches/toolbar.patch 2012-05-24 13:37:17.000000000 -0700 @@ -0,0 +1,16 @@ +Description: Mark main toolbar as a primary toolbar +Author: Robert Ancell +Bug: http://bugs.debian.org/659781 + +Index: remmina/remmina/src/remmina_main.c +=================================================================== +--- remmina.orig/remmina/src/remmina_main.c 2012-02-23 22:15:39.953762296 +0100 ++++ remmina/remmina/src/remmina_main.c 2012-02-23 22:40:59.633808853 +0100 +@@ -1120,6 +1120,7 @@ + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); + + priv->toolbar = gtk_ui_manager_get_widget(uimanager, "/ToolBar"); ++ gtk_style_context_add_class(gtk_widget_get_style_context(priv->toolbar), GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + gtk_box_pack_start(GTK_BOX(vbox), priv->toolbar, FALSE, FALSE, 0); + + remmina_main_create_quick_search(remminamain); 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 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/patches/translations.patch 2012-12-24 11:39:00.000000000 -0800 @@ -1,11 +1,13 @@ -Index: remmina-1.0.0/remmina/desktop/remmina.desktop.in +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/remmina/desktop/remmina.desktop.in 2012-03-22 12:00:33.000000000 +0100 -@@ -0,0 +1,23 @@ ++++ 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 Remote Desktop Client ++_Name=Remmina ++_GenericName=Remote Desktop Client ++_X-GNOME-FullName=Remmina Remote Desktop Client +_Comment=Connect to remote desktops +TryExec=remmina +Exec=remmina @@ -26,10 +28,10 @@ +Exec=remmina --icon +OnlyShowIn=Unity; + -Index: remmina-1.0.0/remmina/po/POTFILES.in +Index: remmina-1.0.0-4ubuntu1/remmina/po/POTFILES.in =================================================================== ---- remmina-1.0.0.orig/remmina/po/POTFILES.in 2012-02-10 19:54:23.000000000 +0100 -+++ remmina-1.0.0/remmina/po/POTFILES.in 2012-03-22 12:00:33.000000000 +0100 +--- 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 @@ -86,11 +88,11 @@ +../remmina-plugins/vnc/vnc_plugin.c +../remmina-plugins/xdmcp/xdmcp_plugin.c + -Index: remmina-1.0.0/remmina/desktop/remmina.desktop +Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop =================================================================== ---- remmina-1.0.0.orig/remmina/desktop/remmina.desktop 2012-03-22 12:00:33.000000000 +0100 -+++ remmina-1.0.0/remmina/desktop/remmina.desktop 2012-03-22 12:41:07.510227645 +0100 -@@ -10,6 +10,7 @@ +--- 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; diff -Nru remmina-1.0.0/debian/patches/trayicon_option.patch remmina-1.0.0/debian/patches/trayicon_option.patch --- remmina-1.0.0/debian/patches/trayicon_option.patch 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/patches/trayicon_option.patch 1969-12-31 16:00:00.000000000 -0800 @@ -1,38 +0,0 @@ ---- a/remmina/src/remmina.c -+++ b/remmina/src/remmina.c -@@ -55,6 +55,7 @@ - static gboolean remmina_option_quit; - static gchar *remmina_option_server; - static gchar *remmina_option_protocol; -+static gboolean remmina_option_icon; - - static GOptionEntry remmina_options[] = - { -@@ -68,6 +69,7 @@ - { "quit", 'q', 0, G_OPTION_ARG_NONE, &remmina_option_quit, "Quit the application", NULL }, - { "server", 's', 0, G_OPTION_ARG_STRING, &remmina_option_server, "Use default server name S", "S" }, - { "protocol", 't', 0, G_OPTION_ARG_STRING, &remmina_option_protocol, "Use default protocol T", "T" }, -+{ "icon", 'i', 0, G_OPTION_ARG_NONE, &remmina_option_icon, "Start as tray icon", NULL }, - { NULL } }; - - static gint remmina_on_command_line(GApplication *app, GApplicationCommandLine *cmdline) -@@ -90,6 +92,7 @@ - remmina_option_plugin = NULL; - remmina_option_server = NULL; - remmina_option_protocol = NULL; -+ remmina_option_icon = FALSE; - - argv = g_application_command_line_get_arguments(cmdline, &argc); - -@@ -157,6 +160,11 @@ - remmina_exec_command(REMMINA_COMMAND_PLUGIN, remmina_option_plugin); - executed = TRUE; - } -+ if (remmina_option_icon) -+ { -+ remmina_exec_command(REMMINA_COMMAND_NONE, remmina_option_icon); -+ executed = TRUE; -+ } - if (!executed) - { - remmina_exec_command(REMMINA_COMMAND_MAIN, NULL); 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 2012-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/patches/unity_launcher_list.patch 2012-12-23 14:17:42.000000000 -0800 @@ -2,9 +2,11 @@ # Ubuntu: https://launchpad.net/bugs/938026 # Upstream: https://github.com/FreeRDP/Remmina/commits/master === modified file 'remmina/remmina/desktop/remmina.desktop' ---- remmina/remmina/desktop/remmina.desktop 2012-02-15 13:27:09 +0000 -+++ remmina/remmina/desktop/remmina.desktop 2012-03-01 00:29:18 +0000 -@@ -9,4 +9,15 @@ +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; @@ -19,5 +21,3 @@ +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-04-24 18:17:28.000000000 -0700 +++ remmina-1.0.0/debian/rules 2012-12-23 13:20:25.000000000 -0800 @@ -3,15 +3,18 @@ %: dh $@ +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_makeshlibs: for plugin in rdp vnc xdmcp nx telepathy; do \ dh_makeshlibs -premmina-plugin-$$plugin -Xremmina-plugin-$$plugin.so; \ done -override_dh_install: - dh_install - cd remmina/po; intltool-update --pot --verbose -g remmina - override_dh_clean: -rm remmina/po/remmina.pot dh_clean