Merge lp://qastaging/~noskcaj/ubuntu/trusty/xchat-gnome/merge into lp://qastaging/ubuntu/trusty/xchat-gnome
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/xchat-gnome/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/xchat-gnome |
| Diff against target: | 248874 lines |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/xchat-gnome/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
| Dmitry Shachnev | Abstain | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
| Jackson Doak (noskcaj) wrote | # |
| Daniel Holbach (dholbach) wrote | # |
| Jackson Doak (noskcaj) wrote | # |
Unmerged revisions
- 88. By Jackson Doak
-
debian/rules: drop autoreconf.mk in favour of using autogen.sh as
the configure script. Fixes FTBFS - 87. By Jackson Doak
-
Add missing comma
- 86. By Jackson Doak
-
add extra patches to bzr
- 85. By Jackson Doak
-
* Merge from debian unstable. Remaining changes:
- debian/control:
- Recommend xchat-gnome-indicator to get Unity integration
- debian/xchat-gnome. gconf-defaults: Set the default enabled plugins,
indicator, netmonitor, and notifyosd.
- debian/rules: update the xchat-gnome-common binary-install target to not
keep a duplicate copy of the xchat-gnome.desktop file.
- debian/patches/ 02_lpi. patch: add Launchpad integration items to the
help menu
- debian/patches/ 04_autojoin_ ubuntu_ chan.patch: add the Ubuntu network
as default selection and default to autojoining #ubuntu.
- debian/patches/ 20_add_ gui_focus. patch: implement GUI focus from XChat.
- debian/patches/ 51_freenode_ default_ port_8001. patch: Drop ports 666x
for FreeNode to workaround a possible DCC exploit.
- debian/patches/ 95_apturl- support. patch: support apt://- urls.
- debian/patches/ 10_xchat- gnome-close- event.patch: add events for
window close.
- debian/patches/ 100-Zero- out-passwords- upon-exit. patch: Cherrypicked
from xchat tree
- debian/patches/ 101-Sync- in-servers- from-xchat. patch: From xchat
upstream
- debian/patches/ 102-Drop- IPV6-servers. patch: Cherrypicked from xchat
tree (LP: #127616)
- debian/patches/ 103-Add- chillfactory- irc-servers. patch: From xchat
Debian
- debian/patches/ 104-Don- t-crash- if-servlist- is-undefined. patch:
Cherrypicked from xchat tree
- debian/patches/ 105-Use- u-instead- of-s.patch: Cherrypicked from xchat
tree
- debian/patches/ 106-ensure- an-empty- string- at-index- 32-for- cmd_deop- etc.patch:
Cherrypicked from xchat tree
- debian/patches/ 107-fix- permissions- on-creating- files.patch:
Cherrypicked from xchat tree
- debian/patches/ 108-userlist- default- width.patch: make sure the userlist
in the main window has a reasonable width by default.
- debian/patches/ 109-use- scrollback- timestamps. patch: use actual
timestamps when loading scrollback files.
- debian/patches/ 110-fix- fd-leak. patch: fix a file handle leak.
- debian/patches/ 111-increase- channel- limit.patch: port code from
xchat to remove the limitation on the number of autojoin channels.
- debian/patches/ 115-fix- network- editor. patch: Fix network editor in
preferences.
- debian/patches/ 116-remove- amiganet. patch: Remove defunct irc network.
- debian/patches/ 117-fix- net-monitor- segfault. patch: fix segfault in
the net monitor plugin.
- debian/patches/ 118-fix- net-monitor- reconnect. patch: correctly reconnect
after suspend and resume.
- Use dh-autoreconf & force update (acient) intltool.
- debian/patches/ 00git_remember_ window_ maximise. patch: Correctly restore
maximized window state
- debian/patches/ 119-fix- null-channel- list-window. patch: fix "(null)"
server name in channel list window. (LP: #903025)
* Drop 109-use-scrollback- timestamps. patch, 110-fix- fd-leak. patch,
115-fix-network- editor. patch, 116-remove- amiganet. patch, link.diff
fixed upstream
* 01_finish_gtk3_port. patch: new patch. Imported from BZ#677043,
contains the missing pieces of the GTK3 port.
* 02_bring_back_completion .patch: reverts unwarranted upstream changes
that remove entirely tab completion.
* 03_scroll_wheel.patch: new patch. Let scroll events be received by
the widget.
* 04_no_spellcheck.patch: disable the spellcheck preferences page
instead of showing a bogus message.
[ Jeremy Bicha ]
* Don't ship .desktop in -common, fixes lintian warning
* Bump debhelper compatibility level to 8.
- Strip debian/tmp/ from .install files.
- Bump Build-Depends on debhelper.
* Bump Standards-Version to 3.9.2
* debian/control.in:
- Removed duplicate intltool build-dep.
* debian/watch: Track .xz tarballs
[ Loïc Minier ]
* watch: properly handle variable major.minor in URL; still no 3.0 tarballs
there though.
[ Emilio Pozuelo Monfort ]
* debian/control.in:
+ Build depend on tcl-dev instead of tcl8.4-dev. Closes: #706140.
[ Andreas Henriksson ]
* New upstream git snapshot
* debian/control.in: Update build-dependencies for upstream Gtk+ 3.x port.
* Non-maintainer upload.
* Apply patches 120-fix-clipboard- segfault. patch and
define_functions_ fix_build. patch from Ubuntu fixing FTBFS
(Closes: 713734) - 84. By Jackson Doak
-
New upstream snapshot.
- 83. By Jackson Doak
-
Merge some of debian
Last time I tested that, the scrolling in Gtk3 version was very slow, it was drawing two or three lines of text per second (and that was making xchat-gnome mostly unusable). Can you please check if it still has that problem?