Merge lp://staging/~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release into lp://staging/~ubuntu-desktop/gtk/ubuntugtk3

Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 36
Proposed branch: lp://staging/~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release
Merge into: lp://staging/~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 1200 lines (+140/-509)
21 files modified
debian/changelog (+27/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/libgail3.0-0.symbols (+0/-1)
debian/libgtk3.0-0.install.in (+1/-1)
debian/libgtk3.0-0.symbols (+37/-36)
debian/libgtk3.0-bin.install.in (+1/-1)
debian/libgtk3.0-dev.install.in (+1/-1)
debian/libgtk3.0-dev.manpages (+1/-1)
debian/patches/004_gir_with_separate_build_tree.patch (+0/-27)
debian/patches/005_support_disabling_x11_extensions.patch (+0/-67)
debian/patches/015_default-fallback-icon-theme.patch (+8/-6)
debian/patches/043_ubuntu_menu_proxy.patch (+51/-37)
debian/patches/061_use_pdf_as_default_printing_standard.patch (+0/-45)
debian/patches/071_no_offscreen_widgets_grabbing.patch (+3/-3)
debian/patches/072_indicator_menu_update.patch (+2/-2)
debian/patches/074_expose_active_menu_item.patch (+0/-70)
debian/patches/091_bugzilla_tooltip_refresh.patch (+3/-53)
debian/patches/093_dso_link_issues.patch (+0/-91)
debian/patches/094_gtkprint_test_fix.patch (+0/-58)
debian/patches/series (+1/-7)
To merge this branch: bzr merge lp://staging/~rodrigo-moya/ubuntu/natty/gtk+3.0/2_99_2_release
Reviewer Review Type Date Requested Status
Robert Ancell Needs Fixing
Review via email: mp+46259@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Two issues:
- The gtk-builder-convert and gtk-update-icon-cache programs need to be versioned so they don't conflict with the GTK2 versions
- The symbols file shouldn't have -1ubuntu1 on the symbol versions

review: Needs Fixing

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: