lp:~johndescs/ubuntu/lucid/gajim/merge-from-squeeze

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/lucid/gajim

Fabrice Coutadeur: Needs Fixing on 2010-05-26

Ubuntu branches: Pending requested 2010-05-25

Diff: 102106 lines (+10985/-44717)

78 files modified

ChangeLog (+30/-0)
README.html (+1/-1)
aclocal.m4 (+2/-2)
config/ltmain.sh (+4/-4)
configure (+135/-103)
configure.ac (+1/-1)
data/glade/input_dialog.glade (+1/-1)
data/glade/message_window.glade (+1/-1)
data/other/cacerts.pem (+45/-0)
data/pixmaps/gajim.svg (+0/-444)
debian/README.Debian (+6/-0)
debian/changelog (+226/-0)
debian/compat (+1/-1)
debian/control (+16/-13)
debian/copyright (+22/-28)
debian/dirs (+8/-0)
debian/docs (+1/-0)
debian/gajim-history-manager.1 (+21/-0)
debian/gajim-remote.manpages (+1/-0)
debian/gajim.install (+0/-8)
debian/gajim.manpages (+3/-0)
debian/gajim.menu (+8/-0)
debian/menu (+0/-8)
debian/patches/00_debian-copying.patch (+22/-0)
debian/patches/00list (+0/-2)
debian/pyversions (+1/-0)
debian/rules (+17/-83)
debian/watch (+3/-1)
gajim.nsi (+1/-1)
m4/libtool.m4 (+7/-6)
m4/ltversion.m4 (+5/-5)
po/LINGUAS (+1/-0)
po/br.po (+0/-10709)
po/el.po (+0/-11153)
po/es.po (+1/-1)
po/gl.po (+3/-3)
po/ja.po (+9867/-0)
po/lt.po (+2/-2)
po/nl.po (+0/-10839)
po/pt.po (+0/-11040)
setup_win32.py (+1/-1)
src/chat_control.py (+10/-2)
src/command_system/errors.py (+3/-1)
src/common/caps.py (+1/-1)
src/common/connection.py (+8/-6)
src/common/connection_handlers.py (+44/-15)
src/common/contacts.py (+4/-0)
src/common/dbus_support.py (+8/-1)
src/common/defs.py (+1/-1)
src/common/exceptions.py (+14/-1)
src/common/passwords.py (+2/-0)
src/common/pep.py (+22/-0)
src/common/resolver.py (+21/-8)
src/common/socks5.py (+9/-2)
src/common/xmpp/auth_nb.py (+22/-14)
src/common/xmpp/client_nb.py (+5/-2)
src/common/xmpp/dispatcher_nb.py (+0/-4)
src/common/xmpp/idlequeue.py (+1/-1)
src/common/xmpp/protocol.py (+1/-0)
src/common/xmpp/roster_nb.py (+6/-3)
src/common/xmpp/tls_nb.py (+3/-0)
src/common/xmpp/transports_nb.py (+3/-3)
src/config.py (+89/-59)
src/conversation_textview.py (+21/-11)
src/dialogs.py (+12/-5)
src/disco.py (+1/-0)
src/gajim-remote.py (+2/-0)
src/gajim.py (+18/-4)
src/groupchat_control.py (+26/-15)
src/gtkexcepthook.py (+0/-1)
src/gtkgui_helpers.py (+4/-3)
src/gui_menu_builder.py (+1/-1)
src/history_window.py (+5/-6)
src/htmltextview.py (+46/-2)
src/message_window.py (+7/-21)
src/notify.py (+51/-39)
src/roster_window.py (+41/-19)
src/systray.py (+9/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

52. By Jonathan Michalon on 2010-05-27

Changes from Fabrice Coutadeur as of 20100527

51. By Jonathan Michalon on 2010-05-26

Changed python build version from 2.5 to 2.6 in debian/rules
debian/control: fixed maintainer
debian/changelog: maverick as target

50. By Jonathan Michalon on 2010-05-25

* Merge from debian testing (LP: #506049), remaining changes:
  - Updated debian/watch
  - Kept Ubuntu patches
    + config-write-sync.patch
    + ubuntu-keyring.patch

49. By Jonathan Michalon on 2010-05-25

Merging shared upstream rev into target branch.

48. By Chris Coulson on 2009-12-15

* debian/control:
  - Change python-gnome2-extras recommends to python-eggtrayicon.
    The former package has gone away in Lucid.

47. By Maia Kozheva <sikon@maia-desktop> on 2009-11-25

Removed installation for .so files

46. By Maia Kozheva <sikon@maia-desktop> on 2009-11-25

Removed obsolete patches

45. By Maia Kozheva <sikon@maia-desktop> on 2009-11-25

Merged new upstream release 0.13

44. By Laurent Bigonville on 2009-11-05

* Fix indicate support (LP: #433495)
* Bump Standards-Version to 3.8.3

43. By Benjamin Drung on 2009-10-27

* Add show_roster_on_startup.patch to fix: The roster will always shown on
  startup even if the user sets show_roster_on_startup to false (LP: #461553).
* debian/rules: Use distclean instead of clean to cleanup.