diff -u pidgin-2.3.1/debian/pidgin-dev.preinst pidgin-2.3.1/debian/pidgin-dev.preinst --- pidgin-2.3.1/debian/pidgin-dev.preinst +++ pidgin-2.3.1/debian/pidgin-dev.preinst @@ -16,7 +16,7 @@ case "$1" in install|upgrade) - if dpkg --compare-versions "$2" lt 2.1.1-2; then + if dpkg --compare-versions "$2" lt 1:2.1.1-2; then if [ -h /usr/share/doc/pidgin-dev ]; then rm /usr/share/doc/pidgin-dev fi diff -u pidgin-2.3.1/debian/control pidgin-2.3.1/debian/control --- pidgin-2.3.1/debian/control +++ pidgin-2.3.1/debian/control @@ -1,7 +1,8 @@ Source: pidgin Section: net Priority: optional -Maintainer: Robert McQueen +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Robert McQueen Uploaders: Ari Pollak Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5.0.0), libgtk2.0-dev, libxss-dev, libmeanwhile-dev, libgadu-dev (>= 1:1.6+20060215-1), @@ -11,8 +12,8 @@ libebook1.2-dev, libedata-book1.2-dev, libcamel1.2-dev, libdbus-glib-1-dev, dbus, python (>= 2.4), libavahi-client-dev, libavahi-glib-dev, libxml-parser-perl, libncursesw5-dev, libsasl2-dev, - xsltproc, doxygen, - libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1), libsqlite3-dev (>= 3.3) + xsltproc, doxygen, liblaunchpad-integration-dev, intltool, libnm-glib-dev, + libsqlite3-dev (>= 3.3) Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/pidgin/ XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/pidgin/ @@ -21,8 +22,8 @@ Package: pidgin Architecture: any Depends: pidgin-data (>= ${source:Upstream-Version}), pidgin-data (<< ${source:Upstream-Version}-z), ${shlibs:Depends}, ${misc:Depends} -Conflicts: gaim (<< 1:2.0.0+beta6-3), pidgin-data (<< 2.1.1-2) -Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin-data (<< 2.1.1-2) +Conflicts: gaim (<< 1:2.0.0+beta6-3), pidgin-data (<< 1:2.1.1-2) +Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin-data (<< 1:2.1.1-2) Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good Suggests: gnome-panel (>= 2.1) | kicker (>= 3.1) | docker, evolution-data-server (>= 1.10.0), ${shlibs:Suggests} Description: graphical multi-protocol instant messaging client for X @@ -82,8 +83,8 @@ Architecture: any Depends: pidgin-data (>= ${source:Upstream-Version}), pidgin-data (<< ${source:Upstream-Version}-z), ${shlibs:Depends}, ${misc:Depends} Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good -Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin (<< 2.1.1-2) -Conflicts: gaim (<< 1:2.0.0+beta6-3), pidgin (<< 2.1.1-2) +Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin (<< 1:2.1.1-2) +Conflicts: gaim (<< 1:2.0.0+beta6-3), pidgin (<< 1:2.1.1-2) Description: text-based multi-protocol instant messaging client Finch is a text/console-based, modular instant messaging client capable of using AIM/ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, Gadu-Gadu, Bonjour, @@ -98,8 +99,8 @@ Section: devel Architecture: all Depends: finch (>= ${source:Version}), pkg-config, libpurple-dev, libglib2.0-dev, libncursesw5-dev -Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin-dev (<< 2.1.1-2) -Conflicts: gaim (<< 1:2.0.0+beta6-3), pidgin-dev (<< 2.1.1-2) +Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin-dev (<< 1:2.1.1-2) +Conflicts: gaim (<< 1:2.0.0+beta6-3), pidgin-dev (<< 1:2.1.1-2) Description: text-based multi-protocol instant messaging client - development This package contains the headers and other development files not included in the main finch package. Install this if you wish to compile your own plugins, @@ -109,8 +110,8 @@ Architecture: any Depends: pidgin-data (>= ${source:Upstream-Version}), pidgin-data (<< ${source:Upstream-Version}-z), ${shlibs:Depends}, ${misc:Depends}, libsasl2-modules Recommends: ca-certificates, libpurple-bin -Replaces: pidgin (<< 2.1.1-2) -Conflicts: pidgin (<< 2.1.1-2) +Replaces: pidgin (<< 1:2.1.1-2) +Conflicts: pidgin (<< 1:2.1.1-2) Suggests: ${shlibs:Suggests} Description: multi-protocol instant messaging library libpurple is a library intended to be used by programmers seeking @@ -126,8 +127,8 @@ Section: libdevel Architecture: all Depends: libpurple0 (>= ${source:Version}), pkg-config, libglib2.0-dev, libdbus-glib-1-dev, ${misc:Depends} -Replaces: pidgin-dev (<< 2.1.1-2) -Conflicts: pidgin-dev (<< 2.1.1-2) +Replaces: pidgin-dev (<< 1:2.1.1-2) +Conflicts: pidgin-dev (<< 1:2.1.1-2) Description: multi-protocol instant messaging library - development files This package contains the headers and other development files not included in the main libpurple0 package. Install this if you wish to compile your own @@ -140,7 +141,17 @@ -Depends: libpurple0, ${shlibs:Depends}, ${misc:Depends}, python, python-dbus -Replaces: pidgin (<< 2.1.1-2) -Conflicts: pidgin (<< 2.1.1-2) +Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-dbus +Replaces: pidgin (<< 1:2.1.1-2) +Conflicts: pidgin (<< 1:2.1.1-2) Description: multi-protocol instant messaging library - extra utilities This package contains the utilities not included in the main libpurple0 package. Currently included are: purple-remote, purple-send, purple-send-async, and purple-url-handler, + +Package: gaim +Architecture: all +Depends: pidgin +Description: transitional package to Pidgin + This dummy package is provided to smooth the upgrade from Gaim to Pidgin. It + contains compatibility links from /usr/bin/gaim and related programs to the + newly-named programs. If you no longer need these links, this package can be + safely removed. + diff -u pidgin-2.3.1/debian/rules pidgin-2.3.1/debian/rules --- pidgin-2.3.1/debian/rules +++ pidgin-2.3.1/debian/rules @@ -19,7 +19,7 @@ ../configure $(DEB_CONFIGURE_NORMAL_ARGS) LDFLAGS = -Wl,--as-needed -DEB_CONFIGURE_EXTRA_FLAGS := --enable-perl --with-zephyr=/usr --enable-dbus --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl +DEB_CONFIGURE_EXTRA_FLAGS := --enable-perl --with-zephyr=/usr --enable-dbus --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl --enable-nm --disable-silc DEB_DH_MAKESHLIBS_ARGS_pidgin := -V -X/usr/lib/pidgin DEB_DH_SHLIBDEPS_ARGS_pidgin := -X/usr/lib/pidgin/gevolution.so -X/usr/lib/pidgin/cap.so -- -dSuggests debian/pidgin/usr/lib/pidgin/cap.so -dDepends @@ -47,6 +47,10 @@ -e '/@OSCAR_AUTHORS@/r libpurple/protocols/oscar/AUTHORS' \ -e '/@OSCAR_AUTHORS@/d' \ debian/copyright.in > debian/copyright + # Translation domain to desktop file + echo 'X-Ubuntu-Gettext-Domain=pidgin' >> debian/tmp/usr/share/applications/pidgin.desktop + # Call intltool-update to build the .pot + cd $(DEB_SRCDIR)/po; intltool-update -p cleanbuilddir/pidgin:: rm -f doc/TracHeader.html doc/TracFooter.html diff -u pidgin-2.3.1/debian/prefs.xml pidgin-2.3.1/debian/prefs.xml --- pidgin-2.3.1/debian/prefs.xml +++ pidgin-2.3.1/debian/prefs.xml @@ -3,8 +3,32 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -u pidgin-2.3.1/debian/changelog pidgin-2.3.1/debian/changelog --- pidgin-2.3.1/debian/changelog +++ pidgin-2.3.1/debian/changelog @@ -1,3 +1,31 @@ +pidgin (2.3.1-2ubuntu1) hardy; urgency=low + + * Sync with Debian, remaining Ubuntu changes; (LP: #177811) + - Set Maintainer to Ubuntu Core Developers. + - Add build-deps on liblaunchpad-integration-dev, intltool, + libnm-glib-dev (for --enable-nm) (Ubuntu #112720). + - Drop build-deps on libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1) as + this library is in universe. + - Drop the libpurple0 recommends on libpurple-bin. + - Add a gaim transitionnal package for upgrades. + - Ship compatibility symlinks via debian/gaim.links. + - Pass --enable-nm to configure to enable NetworkManager support. + - Pass --disable-silc to configure to disable silc support even if + it's installed in the build environment. + - Add X-Ubuntu-Gettext-Domain to the desktop file and update the + translation templates in common-install-impl::. + - Update debian/prefs.xml to set the notify plugin prefs + /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load + the notify plugin; Ubuntu: #13389. + - Add LPI integration patch, 02_lpi. + - Add patch 04_let_crasher_for_apport to stop catching the SIGSEGV signal + and let apport handle it. + - Add patch 05_default_to_irc_ubuntu_com to set the default IRC + server to irc.ubuntu.com. + - Add autoconf patch, 70_autoconf. + + -- Pedro Fragoso Fri, 21 Dec 2007 02:48:06 +0000 + pidgin (2.3.1-2) unstable; urgency=low * Make libpurple0 shlibs slightly looser by making it diff -u pidgin-2.3.1/debian/pidgin-dbg.preinst pidgin-2.3.1/debian/pidgin-dbg.preinst --- pidgin-2.3.1/debian/pidgin-dbg.preinst +++ pidgin-2.3.1/debian/pidgin-dbg.preinst @@ -16,7 +16,7 @@ case "$1" in install|upgrade) - if dpkg --compare-versions "$2" lt 2.1.1-2; then + if dpkg --compare-versions "$2" lt 1:2.1.1-2; then if [ -h /usr/share/doc/pidgin-dbg ]; then rm /usr/share/doc/pidgin-dbg fi diff -u pidgin-2.3.1/debian/pidgin.preinst pidgin-2.3.1/debian/pidgin.preinst --- pidgin-2.3.1/debian/pidgin.preinst +++ pidgin-2.3.1/debian/pidgin.preinst @@ -16,7 +16,7 @@ case "$1" in install|upgrade) - if dpkg --compare-versions "$2" lt 2.1.1-2; then + if dpkg --compare-versions "$2" lt 1:2.1.1-2; then if [ -h /usr/share/doc/pidgin ]; then rm /usr/share/doc/pidgin fi only in patch2: unchanged: --- pidgin-2.3.1.orig/debian/gaim.links +++ pidgin-2.3.1/debian/gaim.links @@ -0,0 +1,6 @@ +usr/bin/finch usr/bin/gaim-text +usr/bin/pidgin usr/bin/gaim +usr/bin/purple-send usr/bin/gaim-send +usr/bin/purple-send-async usr/bin/gaim-send-async +usr/bin/purple-remote usr/bin/gaim-remote +usr/bin/purple-url-handler usr/bin/gaim-url-handler only in patch2: unchanged: --- pidgin-2.3.1.orig/debian/patches/70_autoconf.patch +++ pidgin-2.3.1/debian/patches/70_autoconf.patch @@ -0,0 +1,47 @@ +diff -Nur pidgin-2.2.2/configure pidgin-2.2.2.new/configure +--- pidgin-2.2.2/configure 2007-10-23 22:57:26.000000000 +0200 ++++ pidgin-2.2.2.new/configure 2007-11-07 00:37:37.000000000 +0100 +@@ -27590,12 +27590,12 @@ + pkg_cv_STARTUP_NOTIFICATION_CFLAGS="$STARTUP_NOTIFICATION_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libstartup-notification-1.0 >= 0.5\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.5") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libstartup-notification-1.0 >= 0.5 launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.5 launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= 0.5" 2>/dev/null` ++ pkg_cv_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= 0.5 launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27608,12 +27608,12 @@ + pkg_cv_STARTUP_NOTIFICATION_LIBS="$STARTUP_NOTIFICATION_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libstartup-notification-1.0 >= 0.5\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.5") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libstartup-notification-1.0 >= 0.5 launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.5 launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_STARTUP_NOTIFICATION_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.5" 2>/dev/null` ++ pkg_cv_STARTUP_NOTIFICATION_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.5 launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -27632,9 +27632,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.5"` ++ STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.5 launchpad-integration"` + else +- STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.5"` ++ STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.5 launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$STARTUP_NOTIFICATION_PKG_ERRORS" >&5 only in patch2: unchanged: --- pidgin-2.3.1.orig/debian/patches/02_lpi.patch +++ pidgin-2.3.1/debian/patches/02_lpi.patch @@ -0,0 +1,31 @@ +--- pidgin-2.0.0/configure.ac 2007-05-04 05:20:33.000000000 +0000 ++++ pidgin-2.0.0new/configure.ac 2007-05-04 14:23:29.295701079 +0000 +@@ -383,7 +383,7 @@ + dnl # Check for startup notification + dnl ####################################################################### + if test "x$enable_startup_notification" = "xyes"; then +- PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [ ++ PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5 launchpad-integration], , [ + AC_MSG_RESULT(no) + enable_startup_notification=no + ]) +--- pidgin-2.0.0/pidgin/gtkblist.c 2007-05-04 04:41:49.000000000 +0000 ++++ pidgin-2.0.0new/pidgin/gtkblist.c 2007-05-04 14:24:37.815605805 +0000 +@@ -61,6 +61,8 @@ + #include + #include + ++#include ++ + #define HEADLINE_CLOSE_SIZE 12 + + typedef struct +@@ -4212,6 +4214,8 @@ + NULL, NULL); + gtk_item_factory_create_items(gtkblist->ift, sizeof(blist_menu) / sizeof(*blist_menu), + blist_menu, NULL); ++ launchpad_integration_add_items (gtk_item_factory_get_widget(gtkblist->ift, N_("/Help")), -1, TRUE, TRUE); ++ + pidgin_load_accels(); + g_signal_connect(G_OBJECT(accel_group), "accel-changed", + G_CALLBACK(pidgin_save_accels_cb), NULL); only in patch2: unchanged: --- pidgin-2.3.1.orig/debian/patches/04_let_crasher_for_apport.patch +++ pidgin-2.3.1/debian/patches/04_let_crasher_for_apport.patch @@ -0,0 +1,10 @@ +--- pidgin-2.3.1/pidgin/gtkmain.c 2007-12-07 14:37:11.000000000 +0000 ++++ pidgin-2.3.1/pidgin/gtkmain.c.new 2007-12-21 03:14:32.000000000 +0000 +@@ -93,7 +93,6 @@ + * Each list terminated with -1 + */ + static const int catch_sig_list[] = { +- SIGSEGV, + SIGHUP, + SIGINT, + SIGTERM, only in patch2: unchanged: --- pidgin-2.3.1.orig/debian/patches/05_default_to_irc_ubuntu_com.patch +++ pidgin-2.3.1/debian/patches/05_default_to_irc_ubuntu_com.patch @@ -0,0 +1,11 @@ +--- pidgin-2.0.0/libpurple/protocols/irc/irc.h 2007-04-26 05:35:54.000000000 +0000 ++++ pidgin-2.0.0new/libpurple/protocols/irc/irc.h 2007-05-04 11:18:31.959668369 +0000 +@@ -30,7 +30,7 @@ + #include "roomlist.h" + #include "sslconn.h" + +-#define IRC_DEFAULT_SERVER "irc.freenode.net" ++#define IRC_DEFAULT_SERVER "irc.ubuntu.com" + #define IRC_DEFAULT_PORT 6667 + #define IRC_DEFAULT_SSL_PORT 994 +