Merge lp://qastaging/~noskcaj/ubuntu/trusty/gnome-screenshot/merge into lp://qastaging/ubuntu/trusty/gnome-screenshot
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/gnome-screenshot/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/gnome-screenshot |
| Diff against target: |
23631 lines (+3419/-12268) 80 files modified
.pc/01_use-ubuntu-help.patch/src/screenshot-utils.c (+0/-728) .pc/applied-patches (+0/-5) .pc/ubuntu_interactive_screenshots.patch/src/screenshot-application.c (+0/-861) .pc/ubuntu_unity_no_gnomeshell.patch/src/screenshot-utils.c (+0/-728) .pc/update_unity_list.patch/src/gnome-screenshot.desktop.in (+0/-25) .pc/uri.patch/src/screenshot-application.c (+0/-861) ABOUT-NLS (+0/-1068) Makefile.am (+3/-1) Makefile.in (+5/-21) NEWS (+21/-8) aclocal.m4 (+48/-41) config.guess (+9/-18) config.h.in (+0/-22) config.rpath (+0/-666) config.sub (+16/-14) configure (+52/-2099) configure.ac (+1/-4) debian/changelog (+71/-0) debian/control (+4/-3) debian/control.in (+2/-2) debian/copyright (+0/-6) debian/watch (+1/-1) depcomp (+2/-1) m4/gettext.m4 (+0/-381) m4/iconv.m4 (+0/-180) m4/intlmacosx.m4 (+0/-51) m4/lib-ld.m4 (+0/-110) m4/lib-link.m4 (+0/-709) m4/lib-prefix.m4 (+0/-185) m4/nls.m4 (+0/-31) m4/po.m4 (+0/-449) m4/progtest.m4 (+0/-92) po/af.po (+222/-178) po/ar.po (+77/-67) po/as.po (+72/-64) po/be.po (+66/-64) po/ca.po (+72/-81) po/cs.po (+64/-64) po/da.po (+70/-64) po/de.po (+77/-70) po/es.po (+74/-64) po/et.po (+23/-16) po/eu.po (+73/-65) po/fi.po (+76/-68) po/fr.po (+70/-64) po/ga.po (+221/-179) po/gl.po (+71/-64) po/he.po (+100/-85) po/hu.po (+71/-64) po/id.po (+66/-65) po/it.po (+67/-66) po/ja.po (+76/-66) po/ko.po (+68/-68) po/lt.po (+67/-64) po/lv.po (+73/-65) po/ml.po (+76/-68) po/mr.po (+1/-1) po/nb.po (+66/-66) po/pa.po (+72/-64) po/pl.po (+65/-65) po/pt.po (+79/-71) po/pt_BR.po (+71/-65) po/ru.po (+77/-85) po/sk.po (+72/-64) po/sl.po (+105/-87) po/sr.po (+66/-64) po/sr@latin.po (+66/-64) po/tg.po (+133/-116) po/th.po (+70/-64) po/uk.po (+70/-64) po/zh_HK.po (+72/-67) po/zh_TW.po (+72/-67) src/Makefile.in (+2/-18) src/gnome-screenshot.desktop.in (+1/-6) src/org.gnome.gnome-screenshot.gschema.xml.in (+11/-0) src/screenshot-application.c (+3/-5) src/screenshot-config.c (+9/-0) src/screenshot-config.h (+2/-1) src/screenshot-filename-builder.c (+6/-5) src/screenshot-utils.c (+1/-5) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/gnome-screenshot/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
| Dmitry Shachnev | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
| Jackson Doak (noskcaj) wrote | # |
| Dmitry Shachnev (mitya57) wrote | # |
| Jackson Doak (noskcaj) wrote | # |
Unmerged revisions
- 23. By Jackson Doak
-
* Merge from debian. Remaining changes:
* debian/patches/ 01_use- ubuntu- help.patch:
- restore gnome-utils patch to use the ubuntu help uri
* debian/patches/ ubuntu_ interactive_ screenshots. patch:
- on Unity sessions display a confirmation dialog after taking
screenshots with the keybindings, the auto saving behaviour is
confusing our users
* debian/patches/ ubuntu_ unity_no_ gnomeshell. patch:
- don't try to use the gnome-shell interface under Unity
* debian/patches/ update_ unity_list. patch:
- update to the current xdg format, tweak capitalization
- list action to take screenshot of an area,
thanks Christopher Kyle Horton
* debian/patches/ uri.patch:
- fix display of accented characters correctly - 22. By Jackson Doak
-
decommit patches
I am not able to upload this, but just wondering:
* debian/
- fix display of accented characters correctly
Should this really be part of Ubuntu delta? Was the patch rejected upstream?