Merge lp://staging/~tualatrix/ibentu/gnome-terminal into lp://staging/ibentu
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~tualatrix/ibentu/gnome-terminal |
| Merge into: | lp://staging/ibentu |
| Diff against target: |
453404 lines (+451801/-0) (has conflicts) 297 files modified
.pc/.version (+1/-0) .pc/01_lpi.patch/configure.ac (+195/-0) .pc/01_lpi.patch/src/terminal-window.c (+4026/-0) .pc/01_lpi.patch/src/terminal.xml (+116/-0) .pc/01_onlyshowin.patch/gnome-terminal.desktop.in.in (+14/-0) .pc/02_add_transparency_properties.patch/src/gnome-terminal.schemas.in (+1302/-0) .pc/02_add_transparency_properties.patch/src/profile-editor.c (+921/-0) .pc/02_add_transparency_properties.patch/src/profile-preferences.glade (+2814/-0) .pc/02_add_transparency_properties.patch/src/terminal-profile.c (+1690/-0) .pc/02_add_transparency_properties.patch/src/terminal-profile.h (+191/-0) .pc/02_add_transparency_properties.patch/src/terminal-screen.c (+2343/-0) .pc/20_add_alt_screen_toggle_ui.patch/src/gnome-terminal.schemas.in (+1317/-0) .pc/20_add_alt_screen_toggle_ui.patch/src/profile-editor.c (+932/-0) .pc/20_add_alt_screen_toggle_ui.patch/src/profile-preferences.glade (+2833/-0) .pc/20_add_alt_screen_toggle_ui.patch/src/terminal-profile.c (+1693/-0) .pc/20_add_alt_screen_toggle_ui.patch/src/terminal-profile.h (+192/-0) .pc/20_add_alt_screen_toggle_ui.patch/src/terminal-screen.c (+2375/-0) .pc/applied-patches (+4/-0) AUTHORS (+3/-0) COPYING (+676/-0) ChangeLog (+47086/-0) ChangeLog.README (+16/-0) ChangeLog.pre-2-23 (+4754/-0) HACKING (+13/-0) Makefile.am (+64/-0) Makefile.in (+877/-0) NEWS (+730/-0) README (+19/-0) aclocal.m4 (+10078/-0) config.guess (+1501/-0) config.h.in (+107/-0) config.sub (+1705/-0) configure (+16194/-0) configure.ac (+196/-0) debian/changelog (+1829/-0) debian/compat (+1/-0) debian/control (+65/-0) debian/control.in (+60/-0) debian/copyright (+43/-0) debian/fonts.conf (+11/-0) debian/gnome-terminal-data.debhelper.log (+1/-0) debian/gnome-terminal-data.install (+7/-0) debian/gnome-terminal.debhelper.log (+1/-0) debian/gnome-terminal.install (+3/-0) debian/gnome-terminal.links (+1/-0) debian/gnome-terminal.manpages (+1/-0) debian/gnome-terminal.menu (+6/-0) debian/gnome-terminal.postinst (+13/-0) debian/gnome-terminal.prerm (+10/-0) debian/gnome-terminal.sgml (+223/-0) debian/gnome-terminal.wrapper (+81/-0) debian/gnome-terminal.xpm (+166/-0) debian/patches/01_lpi.patch (+47/-0) debian/patches/01_onlyshowin.patch (+11/-0) debian/patches/02_add_transparency_properties.patch (+330/-0) debian/patches/20_add_alt_screen_toggle_ui.patch (+148/-0) debian/patches/series (+4/-0) debian/rules (+21/-0) debian/source/format (+1/-0) debian/watch (+3/-0) depcomp (+630/-0) gnome-doc-utils.make (+655/-0) gnome-terminal.desktop.in.in (+15/-0) help/C/gnome-terminal.xml (+1140/-0) help/C/legal.xml (+76/-0) help/Makefile.am (+17/-0) help/Makefile.in (+1173/-0) help/bg/Makefile.am (+10/-0) help/bg/Makefile.in (+573/-0) help/bg/gnome-terminal-bg.omf (+18/-0) help/bg/gnome-terminal.xml (+943/-0) help/bg/legal.xml (+9/-0) help/ca/ca.po (+1967/-0) help/ca/gnome-terminal.xml (+963/-0) help/cs/cs.po (+1916/-0) help/cs/gnome-terminal.xml (+956/-0) help/da/da.po (+1921/-0) help/da/gnome-terminal.xml (+957/-0) help/de/de.po (+2018/-0) help/de/gnome-terminal.xml (+956/-0) help/el/el.po (+1985/-0) help/el/gnome-terminal.xml (+957/-0) help/en_GB/en_GB.po (+1918/-0) help/en_GB/gnome-terminal.xml (+957/-0) help/es/es.po (+1982/-0) help/es/gnome-terminal.xml (+956/-0) help/fr/fr.po (+1979/-0) help/fr/gnome-terminal.xml (+956/-0) help/gnome-terminal.omf.in (+9/-0) help/it/gnome-terminal.xml (+960/-0) help/it/it.po (+2052/-0) help/ja/Makefile.am (+10/-0) help/ja/Makefile.in (+573/-0) help/ja/gnome-terminal-ja.omf (+35/-0) help/ja/gnome-terminal.xml (+1388/-0) help/ja/legal.xml (+47/-0) help/ko/gnome-terminal.xml (+965/-0) help/ko/ko.po (+1824/-0) help/oc/gnome-terminal.xml (+1184/-0) help/oc/oc.po (+1532/-0) help/pt_BR/gnome-terminal.xml (+960/-0) help/pt_BR/pt_BR.po (+1203/-0) help/ro/Makefile.am (+10/-0) help/ro/Makefile.in (+573/-0) help/ro/gnome-terminal-ro.omf (+35/-0) help/ro/gnome-terminal.xml (+1403/-0) help/ro/legal.xml (+70/-0) help/ru/gnome-terminal.xml (+980/-0) help/ru/ru.po (+1121/-0) help/sv/gnome-terminal.xml (+963/-0) help/sv/sv.po (+1160/-0) help/uk/gnome-terminal.xml (+980/-0) help/uk/uk.po (+1936/-0) help/zh_CN/gnome-terminal.xml (+956/-0) help/zh_CN/zh_CN.po (+1788/-0) help/zh_TW/Makefile.am (+10/-0) help/zh_TW/Makefile.in (+573/-0) help/zh_TW/gnome-terminal-zh_TW.omf (+35/-0) help/zh_TW/gnome-terminal.xml (+1212/-0) help/zh_TW/legal.xml (+54/-0) install-sh (+520/-0) ltmain.sh (+8406/-0) missing (+376/-0) mkinstalldirs (+162/-0) omf.make (+61/-0) po/LINGUAS (+92/-0) po/Makefile.in.in (+217/-0) po/POTFILES.in (+28/-0) po/POTFILES.skip (+12/-0) po/am.po (+2483/-0) po/ar.po (+2786/-0) po/as.po (+2921/-0) po/ast.po (+2438/-0) po/az.po (+2719/-0) po/be.po (+2496/-0) po/be@latin.po (+2946/-0) po/bg.po (+2707/-0) po/bn.po (+2647/-0) po/bn_IN.po (+2660/-0) po/br.po (+2248/-0) po/bs.po (+2760/-0) po/ca.po (+3414/-0) po/ca@valencia.po (+3383/-0) po/cs.po (+2597/-0) po/cy.po (+3117/-0) po/da.po (+3329/-0) po/de.po (+3078/-0) po/dz.po (+2377/-0) po/el.po (+2977/-0) po/en@shaw.po (+2580/-0) po/en_CA.po (+2777/-0) po/en_GB.po (+3339/-0) po/eo.po (+2405/-0) po/es.po (+2922/-0) po/et.po (+2153/-0) po/eu.po (+2661/-0) po/fa.po (+2823/-0) po/fi.po (+3209/-0) po/fr.po (+2741/-0) po/fur.po (+2225/-0) po/ga.po (+2302/-0) po/gl.po (+2727/-0) po/gu.po (+2634/-0) po/he.po (+3302/-0) po/hi.po (+2289/-0) po/hr.po (+2704/-0) po/hu.po (+2663/-0) po/hy.po (+2048/-0) po/id.po (+2660/-0) po/it.po (+2720/-0) po/ja.po (+2707/-0) po/ka.po (+2786/-0) po/kk.po (+2402/-0) po/kn.po (+2670/-0) po/ko.po (+2632/-0) po/ku.po (+2542/-0) po/lt.po (+3165/-0) po/lv.po (+3188/-0) po/mai.po (+2022/-0) po/mg.po (+2897/-0) po/mk.po (+2701/-0) po/ml.po (+2649/-0) po/mn.po (+2656/-0) po/mr.po (+2612/-0) po/ms.po (+2727/-0) po/nb.po (+2671/-0) po/nds.po (+2018/-0) po/ne.po (+2553/-0) po/nl.po (+3395/-0) po/nn.po (+3078/-0) po/oc.po (+2434/-0) po/or.po (+2625/-0) po/pa.po (+2642/-0) po/pl.po (+2670/-0) po/ps.po (+1721/-0) po/pt.po (+3382/-0) po/pt_BR.po (+2740/-0) po/ro.po (+2648/-0) po/ru.po (+2209/-0) po/rw.po (+3088/-0) po/si.po (+2502/-0) po/sk.po (+2404/-0) po/sl.po (+2219/-0) po/sq.po (+2772/-0) po/sr.po (+3370/-0) po/sr@latin.po (+3370/-0) po/sv.po (+2348/-0) po/ta.po (+2643/-0) po/te.po (+2620/-0) po/th.po (+3247/-0) po/tr.po (+2489/-0) po/ug.po (+2678/-0) po/uk.po (+2601/-0) po/vi.po (+1957/-0) po/wa.po (+2806/-0) po/xh.po (+2850/-0) po/zh_CN.po (+2553/-0) po/zh_HK.po (+2664/-0) po/zh_TW.po (+2800/-0) src/Makefile.am (+205/-0) src/Makefile.in (+1470/-0) src/eggdesktopfile.c (+1510/-0) src/eggdesktopfile.h (+160/-0) src/eggshell.c (+114/-0) src/eggshell.h (+40/-0) src/eggsmclient-osx.c (+235/-0) src/eggsmclient-private.h (+53/-0) src/eggsmclient-win32.c (+353/-0) src/eggsmclient-xsmp.c (+1405/-0) src/eggsmclient.c (+610/-0) src/eggsmclient.h (+123/-0) src/encodings-dialog.glade (+296/-0) src/extra-strings.c (+73/-0) src/find-dialog.glade (+236/-0) src/gnome-terminal.schemas.in (+1334/-0) src/keybinding-editor.glade (+194/-0) src/profile-editor.c (+937/-0) src/profile-editor.h (+34/-0) src/profile-manager.glade (+213/-0) src/profile-new-dialog.glade (+261/-0) src/profile-preferences.glade (+2854/-0) src/skey-challenge.glade (+198/-0) src/skey-popup.c (+228/-0) src/skey-popup.h (+35/-0) src/skey/Makefile.am (+60/-0) src/skey/Makefile.in (+773/-0) src/skey/btoe.c (+304/-0) src/skey/btoe.h (+2/-0) src/skey/md4.c (+335/-0) src/skey/md4.h (+19/-0) src/skey/md5.c (+67/-0) src/skey/md5.h (+9/-0) src/skey/sha1.c (+112/-0) src/skey/sha1.h (+9/-0) src/skey/skey.c (+37/-0) src/skey/skey.h (+10/-0) src/skey/skeyutil.c (+24/-0) src/skey/skeyutil.h (+3/-0) src/skey/test.c (+99/-0) src/terminal-accels.c (+1012/-0) src/terminal-accels.h (+35/-0) src/terminal-app.c (+2116/-0) src/terminal-app.h (+159/-0) src/terminal-debug.c (+45/-0) src/terminal-debug.h (+74/-0) src/terminal-encoding.c (+614/-0) src/terminal-encoding.h (+61/-0) src/terminal-info-bar.c (+119/-0) src/terminal-info-bar.h (+62/-0) src/terminal-intl.h (+27/-0) src/terminal-marshal.list (+1/-0) src/terminal-options.c (+1396/-0) src/terminal-options.h (+118/-0) src/terminal-profile.c (+1697/-0) src/terminal-profile.h (+193/-0) src/terminal-screen-container.c (+409/-0) src/terminal-screen-container.h (+69/-0) src/terminal-screen.c (+2378/-0) src/terminal-screen.h (+160/-0) src/terminal-search-dialog.c (+378/-0) src/terminal-search-dialog.h (+49/-0) src/terminal-tab-label.c (+289/-0) src/terminal-tab-label.h (+64/-0) src/terminal-tabs-menu.c (+487/-0) src/terminal-tabs-menu.h (+56/-0) src/terminal-type-builtins.c.template (+45/-0) src/terminal-type-builtins.h.template (+25/-0) src/terminal-util.c (+1213/-0) src/terminal-util.h (+117/-0) src/terminal-version.h (+35/-0) src/terminal-version.h.in (+35/-0) src/terminal-window.c (+4047/-0) src/terminal-window.h (+106/-0) src/terminal.about (+5/-0) src/terminal.c (+619/-0) src/terminal.xml (+118/-0) xmldocs.make (+101/-0) Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file debian. Moved existing file to debian.moved. |
| To merge this branch: | bzr merge lp://staging/~tualatrix/ibentu/gnome-terminal |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ding Zhou | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 76. By Ding Zhou
-
Release gnome-terminal 2.32.0-0ubuntu2
- 75. By Ding Zhou
-
Add Search selection on Google support
- 74. By Chris Coulson
-
* New upstream version 2.32.0
* Drop 21_dont_crash_on_ composite_ change. patch - merged upstream - 73. By Chris Coulson
-
* Fix LP: #633303 - gnome-terminal crashed with signal 5 in _XError()
when Mutter is restarted. Make sure gnome-terminal sets _NET_WM_DESKTOP
on the new X window, rather than the one that was destroyed previously
- add debian/patches/ 21_dont_ crash_on_ composite_ change. patch
- update debian/patches/ series - 72. By Robert Ancell
-
* New upstream release
* debian/control:
- Bump build-depend on libvte-dev - 71. By Robert Ancell
-
* New upstream release
* debian/control:
- Build-depend on dh-autoreconf
- Bump build-depend on libglib2.0-dev, libgtk2.0-dev, libvte-dev,
libgconf2-dev
* debian/rules:
- Use autoreconf.mk - 70. By Chris Coulson
-
* Fix LP: #549552 - solid colour BG is transparent. When set to solid,
the terminal window inherits transparency from the GTK theme. Add
a checkbutton in the Background tab of the preferences to inherit
background settings from the theme to make it possible to choose
a solid colour again (without having to select "Transparent" and
then adjusting the slider to maximum)
- update debian/patches/ 02_add_ transparency_ properties. patch - 69. By Robert Ancell
-
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in:
- Build depend on gnome-common for autotools
- Build depend on liblaunchpad-integration- dev
- Add Bzr link
- Update replaces version on gnome-terminal-data
* debian/rules:
- Run autotools on build
* debian/patches/ 01_lpi. patch:
- Launchpad integration
* debian/patches/ 02_add_ transparency_ properties. patch:
- This patch allows the background transparency to be controlled from
the GTK theme (using "TerminalScreen::background- darkness" ). In
addition to this, the background colour and text colour are already
themable from the GTK theme (by setting the "text[NORMAL]" and
"base[NORMAL]" colours for the TerminalScreen class)
* debian/patches/ 20_add_ alt_screen_ toggle_ ui.patch:
- Hook new vte alternate screen scrolling toggle via UI
* debian/watch:
- Watch for unstable versions - 68. By Robert Ancell
-
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in:
- Build depend on liblaunchpad-integration- dev
- Build depend on gnome-common to run autoreconf
- Add Bzr link
* debian/rules:
- Run autoreconf on build
* debian/patches/ 01_lpi. patch:
- LP integration
* debian/patches/ 02_add_ transparency_ properties. patch:
- This patch allows the background transparency to be controlled from
the GTK theme (using "TerminalScreen::background- darkness" ). In
addition to this, the background colour and text colour are already
themable from the GTK theme (by setting the "text[NORMAL]" and
"base[NORMAL]" colours for the TerminalScreen class)
* debian/patches/ 20_add_ alt_screen_ toggle_ ui.patch:
- Hook new vte alternate screen scrolling toggle via UI
* debian/watch:
- Watch for unstable versions - 67. By Chris Coulson
-
* Revert the previous changes to add a new profile, as changing
the default profile on upgrade is suboptimal, and there are better
ways to implement the visual changes
- Removed patches:
+ 02_rename_default_ profile. patch
+ 03_add_new_profiles_ on_upgrade. patch
+ 04_change_fallback_ profile. patch
- Delete debian/gnome-terminal- ambiance. schemas
- Delete ebian/gnome-termina- data.gconf- defaults
- debian/rules:
+ Don't install custom schema
* Add debian/patches/ 02_add_ transparency_ properties. patch:
- This patch allows the background transparency to be controlled from
the GTK theme (using "TerminalScreen::background- darkness" ). In
addition to this, the background colour and text colour are already
themable from the GTK theme (by setting the "text[NORMAL]" and
"base[NORMAL]" colours for the TerminalScreen class)
* debian/gnome-terminal- data.postinst:
- Fix up the system gconf defaults when upgrading from a previous
unstable version which had the extra profile. Users upgrading from
this will probably still need to remove the "Ambiance" profile
manually from their configuration though (there's not an easy way
to do this automatically, and it only affects users upgrading
from previous unstable versions)
* This fixes LP: #532511 and LP: #542144
