lp://qastaging/~noskcaj/ubuntu/vivid/remmina/1.1.2

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://qastaging/ubuntu/vivid/remmina

Marc Deslauriers: Needs Fixing on 2015-01-06

Diff: 1346 lines (+153/-796)

18 files modified

.pc/applied-patches (+0/-1)
.pc/external_tools.patch/remmina/CMakeLists.txt (+17/-8)
.pc/vte-2.91.patch/cmake/FindVTE.cmake (+0/-46)
.pc/vte-2.91.patch/remmina/CMakeLists.txt (+0/-172)
.pc/vte-2.91.patch/remmina/src/remmina_ssh_plugin.c (+0/-364)
CMakeLists.txt (+1/-1)
debian/changelog (+31/-0)
debian/patches/external_tools.patch (+1/-1)
debian/patches/series (+0/-1)
debian/patches/vte-2.91.patch (+0/-96)
remmina-plugins/rdp/rdp_event.c (+13/-4)
remmina-plugins/rdp/rdp_plugin.c (+58/-70)
remmina-plugins/rdp/rdp_plugin.h (+4/-2)
remmina/CMakeLists.txt (+17/-8)
remmina/external_tools/CMakeLists.txt (+1/-4)
remmina/src/remmina_about.c (+1/-0)
remmina/src/remmina_connection_window.c (+4/-17)
remmina/src/remmina_string_list.c (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

28. By Jackson Doak on 2014-12-20

* Merge with Debian, remaining changes:
  + 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.
* Drop vte-2.91.patch. Fixed upstream
* New upstream release.
  - Drop RDP_certificate_crash.patch, already available upstream.
  - Fix bugs with plugins using GtkSocket.
* debian/patches/RDP_certificate_crash.patch:
  - Cherry-pick patches from upstream to fix a crash when not
    accepting certificate for RDP server (Closes: #766671).

27. By Iain Lane on 2014-11-07

* 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

26. By Robert Ancell on 2014-09-02

* 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

25. By Sebastien Bacher on 2013-07-15

debian/patches/keywords.patch: update remmina.desktop as well,
the file is not updated during the build (lp: #1024480)

24. By Daniel T Chen on 2013-04-03

Added missing libs to link, fixing FTBFS (LP: #1163798).

23. By Alex Chiang on 2013-01-17

[ 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.

22. By Sebastien Bacher on 2012-07-27

* 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)

21. By Jean-Louis Dupond on 2012-05-08

debian/patches/clipboard.patch: add clipboard support.
(LP: #937522)

20. By Jean-Louis Dupond on 2012-04-22

debian/patches/scroll_smooth.patch: fix scrolling with GDK_SCROLL_SMOOTH
(LP: #952964).

19. By Sebastien Bacher on 2012-03-22

* debian/control: build-depends on intltool
* debian/patches/translations.patch: set the gettext domain as well