Ubuntu
remmina package

Merge lp://staging/~noskcaj/ubuntu/vivid/remmina/1.1.2 into lp://staging/ubuntu/vivid/remmina

  1. Vivid (15.04)
  2. 1.1.2
  3. Merge into vivid
Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://staging/~noskcaj/ubuntu/vivid/remmina/1.1.2
Merge into: lp://staging/ubuntu/vivid/remmina
Diff against target: 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)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/vivid/remmina/1.1.2
Reviewer Review Type Date Requested Status
Marc Deslauriers Needs Fixing
Review via email: mp+245258@code.staging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Thanks for this merge, I do have a few comments though:

1- Why did you drop debian/docs?
2- Could you please remove indicator_set_title.patch if it's not being applied?
3- Please document the switch to libvte-2.91-dev in the changelog.

Thanks!

review: Needs Fixing
Reply

Unmerged revisions

28. By Jackson Doak

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: