-
Committer:
Bazaar Package Importer
-
Author(s):
Didier Roche
-
Date:
2009-03-09 23:25:48 UTC
-
mfrom:
(1.1.17 upstream)
-
Revision ID:
james.westby@ubuntu.com-20090309232548-f40pm5ooqwd64t0e
Tags: 1:2.5.5-1ubuntu1
* Merge from debian, remaining changes: (LP: #316636, #336647)
- debian/control:
+ Add Build-Deps on liblaunchpad-integration-dev, intltool,
network-manager-dev
+ Add epoch in dependencies
+ Drop the libpurple0 dependency on libpurple-bin
- debian/libpurple0.symbols: add epoch to symbol
- debian/pidgin-dbg.preinst, debian/pidgin-dev.preinst,
debian/pidgin.preinst: add epoch
- Update debian/prefs.xml to set the notify plugin prefs
/plugins/gtk/X11/notify/*, set /pidgin/plugins/loaded to load
the notify plugin and enable the standard logging options by default
- debian/rules:
+ remove --disable-nm as nm has been fixed in Ubuntu
+ Add X-Ubuntu-Gettext-Domain to the desktop file and update the
translation templates in common-install-impl::
- debian/patches:
+ 02_lpi.patch for LP integration
+ 04_let_crasher_for_apport.patch to stop catching the SIGSEGV signal
and let apport handle it
+ 05_default_to_irc_ubuntu_com.patch to set the default IRC
server to irc.ubuntu.com
+ 70_autoconf.patch
+ 60_1024x600_gtk*.c.patch: Add scrolled bars into account dialog,
pounce windows and preference window when screen height is less than 600.
* Adapt debian/patches/02_lpi.patch
* Re-generate debian/patches/70_autoconf.patch
* Remove debian/patches/fix-icons-backport-from-2.5.5mtn.diff as taken
upstream