diff -Nru ekiga-3.2.7/debian/changelog ekiga-3.2.7/debian/changelog --- ekiga-3.2.7/debian/changelog 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/changelog 2011-08-07 19:11:18.000000000 +0700 @@ -1,3 +1,34 @@ +ekiga (3.2.7-4ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #819973). Remaining changes: + - debian/control: Add Build-Depends liblaunchpad-integration-dev and + autoconf. + - debian/patches/ubuntu_lpi.patch: Add launchpad integration. + - debian/rules: Run autoreconf during build. + * Droppped changes: + - debian/rules: Drop quilt depends, apllied upstream. + + -- Mahyuddin Susanto Sun, 07 Aug 2011 19:11:05 +0700 + +ekiga (3.2.7-4) unstable; urgency=low + + * Fix compilation with libnotify0.7 (Closes: #630266) + + -- Kilian Krause Sun, 10 Jul 2011 10:20:53 +0200 + +ekiga (3.2.7-3) unstable; urgency=low + + [ Eugen Dedu ] + * Depend on updated libpt-dbg (Closes: #633132) + + [ Kilian Krause ] + * Clean out quilt and bump to dpkg-source v3 + * Bump debhelper compat to 8 + * Correct Vcs-Browser URL + * Bump Standards-Version to 3.9.2.0 (no changes required) + + -- Kilian Krause Sat, 09 Jul 2011 21:48:43 +0200 + ekiga (3.2.7-2ubuntu2) natty; urgency=low * No change rebuild against current libebook @@ -604,8 +635,6 @@ -- Jose Carlos Garcia Sogo Mon, 13 Sep 2004 23:42:01 +0200 - - gnomemeeting (1.0.2-5) unstable; urgency=low * debian/control: rebuild to make sure rtti-enabled pwlib is used @@ -816,7 +845,7 @@ This fixes the dependency on libsdl1.2-dev. -- Sander Smeenk Tue, 06 Aug 2002 19:39:41 +0200 - + gnomemeeting (0.93.1-1) unstable; urgency=low * New upstream has ARTSd suspension code removed. @@ -926,4 +955,3 @@ -- Sander Smeenk Wed, 4 Jul 2001 14:03:24 +0200 - diff -Nru ekiga-3.2.7/debian/compat ekiga-3.2.7/debian/compat --- ekiga-3.2.7/debian/compat 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/compat 2011-07-11 01:14:46.000000000 +0700 @@ -1 +1 @@ -5 +8 diff -Nru ekiga-3.2.7/debian/control ekiga-3.2.7/debian/control --- ekiga-3.2.7/debian/control 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/control 2011-08-07 19:11:23.000000000 +0700 @@ -9,12 +9,12 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Kilian Krause Uploaders: Jose Carlos Garcia Sogo , Eugen Dedu , Debian GNOME Maintainers , Kilian Krause -Build-Depends: debhelper (>= 7), +Build-Depends: debhelper (>= 8), libsasl2-dev, gettext, libldap2-dev, - libpt-dev (>= 2.6.5), - libopal-dev (>= 3.6.6~), + libpt-dev (>= 2.6.7), + libopal-dev (>= 3.6.8~), libgconf2-dev, libxv-dev, autotools-dev, @@ -35,12 +35,11 @@ libxext-dev, automake, autoconf, - liblaunchpad-integration-dev, - quilt -Standards-Version: 3.8.3 -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/ekiga -Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/ -Homepage: http://www.ekiga.org + liblaunchpad-integration-dev +Standards-Version: 3.9.2.0 +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/ekiga/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/ekiga/ +Homepage: http://www.ekiga.org/ DM-Upload-Allowed: yes Package: ekiga @@ -73,7 +72,7 @@ Architecture: any Depends: ekiga (= ${binary:Version}), ${misc:Depends}, - libpt2.6.7-dbg, + libpt-dbg, libopal-dbg Suggests: libc6-dbg Description: H.323 and SIP compatible VoIP client - debug symbols diff -Nru ekiga-3.2.7/debian/control.in ekiga-3.2.7/debian/control.in --- ekiga-3.2.7/debian/control.in 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/control.in 2011-08-03 00:21:22.000000000 +0700 @@ -4,12 +4,12 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Kilian Krause Uploaders: Jose Carlos Garcia Sogo , Eugen Dedu , @GNOME_TEAM@ -Build-Depends: debhelper (>= 7), +Build-Depends: debhelper (>= 8), libsasl2-dev, gettext, libldap2-dev, - libpt-dev (>= 2.6.5), - libopal-dev (>= 3.6.6~), + libpt-dev (>= 2.6.7), + libopal-dev (>= 3.6.8~), libgconf2-dev, libxv-dev, autotools-dev, @@ -30,12 +30,11 @@ libxext-dev, automake, autoconf, - liblaunchpad-integration-dev, - quilt -Standards-Version: 3.8.3 -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/ekiga -Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/ -Homepage: http://www.ekiga.org + liblaunchpad-integration-dev +Standards-Version: 3.9.2.0 +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/ekiga/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/ekiga/ +Homepage: http://www.ekiga.org/ DM-Upload-Allowed: yes Package: ekiga @@ -68,7 +67,7 @@ Architecture: any Depends: ekiga (= ${binary:Version}), ${misc:Depends}, - libpt2.6.7-dbg, + libpt-dbg, libopal-dbg Suggests: libc6-dbg Description: H.323 and SIP compatible VoIP client - debug symbols diff -Nru ekiga-3.2.7/debian/patches/libnotify0.7.patch ekiga-3.2.7/debian/patches/libnotify0.7.patch --- ekiga-3.2.7/debian/patches/libnotify0.7.patch 1970-01-01 07:00:00.000000000 +0700 +++ ekiga-3.2.7/debian/patches/libnotify0.7.patch 2011-07-10 14:15:59.000000000 +0700 @@ -0,0 +1,63 @@ +Origin: upstream +Applied-Upstream: Thu, 04 Nov 2010 20:36:50 +0000 +Author: Flo Gravo +Description: Fix compilation with libnotify0.7 + +Upstream commit 6a964b0889fbdb164a036649c4aea1cc3c9818e3 Mon Sep 17 00:00:00 2001 + +Fixes bug #632848. +--- +--- a/lib/engine/components/libnotify/libnotify-main.cpp ++++ b/lib/engine/components/libnotify/libnotify-main.cpp +@@ -158,7 +158,16 @@ LibNotify::on_notification_added (gmref_ + + notif = notify_notification_new (notification->get_title ().c_str (), + notification->get_body ().c_str (), +- urgency, NULL); ++ urgency ++// NOTIFY_CHECK_VERSION appeared in 0.5.2 only ++#ifdef NOTIFY_CHECK_VERSION ++#if !NOTIFY_CHECK_VERSION(0,7,0) ++ , NULL ++#endif ++#else ++ , NULL ++#endif ++ ); + + g_signal_connect (notif, "closed", + G_CALLBACK (on_notif_closed), notification.get ()); +--- a/src/gui/main.cpp ++++ b/src/gui/main.cpp +@@ -2820,12 +2820,29 @@ ekiga_main_window_incoming_call_notify ( + + body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); + +- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); ++ ++ notify = notify_notification_new (title, body, GM_ICON_LOGO ++// NOTIFY_CHECK_VERSION appeared in 0.5.2 only ++#ifndef NOTIFY_CHECK_VERSION ++ , NULL ++#else ++#if !NOTIFY_CHECK_VERSION(0,7,0) ++ , NULL ++#endif ++#endif ++ ); + notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); + notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); +- notify_notification_attach_to_status_icon (notify, statusicon); ++// NOTIFY_CHECK_VERSION appeared in 0.5.2 only ++#ifndef NOTIFY_CHECK_VERSION ++ notify_notification_attach_to_status_icon (notify, statusicon); ++#else ++#if !NOTIFY_CHECK_VERSION(0,7,0) ++ notify_notification_attach_to_status_icon (notify, statusicon); ++#endif ++#endif + if (!notify_notification_show (notify, NULL)) { + ekiga_main_window_incoming_call_dialog_show (mw, call); + } diff -Nru ekiga-3.2.7/debian/patches/series ekiga-3.2.7/debian/patches/series --- ekiga-3.2.7/debian/patches/series 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/patches/series 2011-08-03 00:29:43.000000000 +0700 @@ -1 +1,2 @@ +libnotify0.7.patch ubuntu_lpi.patch diff -Nru ekiga-3.2.7/debian/patches/ubuntu_lpi.patch ekiga-3.2.7/debian/patches/ubuntu_lpi.patch --- ekiga-3.2.7/debian/patches/ubuntu_lpi.patch 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/patches/ubuntu_lpi.patch 2011-08-03 00:44:14.000000000 +0700 @@ -1,7 +1,11 @@ -diff -r 24a20cd0733d configure.ac ---- a/configure.ac Tue Mar 17 15:09:14 2009 -0400 -+++ b/configure.ac Thu Mar 26 12:14:31 2009 -0400 -@@ -203,6 +203,25 @@ +Description: Add launchpad integration +Author: Daniel Holbach + +Index: ekiga-3.2.7-4ubuntu1/configure.ac +=================================================================== +--- ekiga-3.2.7-4ubuntu1.orig/configure.ac 2010-05-31 04:58:58.000000000 +0700 ++++ ekiga-3.2.7-4ubuntu1/configure.ac 2011-08-03 00:36:41.585983102 +0700 +@@ -205,6 +205,25 @@ dnl ############################### @@ -26,8 +30,8 @@ +dnl ############################### dnl GNOME support dnl ############################### - GNOME="disabled" -@@ -799,6 +818,7 @@ + GNOME="unneeded" +@@ -894,6 +913,7 @@ echo " GConf support : $GCONF" echo " Evolution-Data-Server support : $EDS" echo " NOTIFY support : $NOTIFY" @@ -35,12 +39,13 @@ fi echo " LDAP support : $LDAP" echo "" -diff -r 24a20cd0733d src/Makefile.am ---- a/src/Makefile.am Tue Mar 17 15:09:14 2009 -0400 -+++ b/src/Makefile.am Thu Mar 26 12:14:31 2009 -0400 -@@ -142,8 +142,8 @@ +Index: ekiga-3.2.7-4ubuntu1/src/Makefile.am +=================================================================== +--- ekiga-3.2.7-4ubuntu1.orig/src/Makefile.am 2010-05-31 04:58:01.000000000 +0700 ++++ ekiga-3.2.7-4ubuntu1/src/Makefile.am 2011-08-03 00:36:41.585983102 +0700 +@@ -152,8 +152,8 @@ fi \ - fi) + fi -AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS) -AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS) @@ -48,10 +53,11 @@ +AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS) $(LP_LIBS) ekiga_LDADD = \ - $(top_builddir)/lib/libekiga.la $(top_builddir)/lib/engine/libekiga_engine.la $(AM_LIBS) -diff -r 24a20cd0733d src/gui/main.cpp ---- a/src/gui/main.cpp Tue Mar 17 15:09:14 2009 -0400 -+++ b/src/gui/main.cpp Thu Mar 26 12:14:31 2009 -0400 + $(top_builddir)/lib/libekiga.la $(top_builddir)/lib/engine/libekiga_engine.la $(AM_LIBS) +Index: ekiga-3.2.7-4ubuntu1/src/gui/main.cpp +=================================================================== +--- ekiga-3.2.7-4ubuntu1.orig/src/gui/main.cpp 2011-08-03 00:36:41.575983081 +0700 ++++ ekiga-3.2.7-4ubuntu1/src/gui/main.cpp 2011-08-03 00:36:41.585983102 +0700 @@ -35,6 +35,8 @@ * build the main window. */ @@ -61,7 +67,7 @@ #include "revision.h" #include "config.h" -@@ -3285,6 +3287,7 @@ +@@ -3325,6 +3327,7 @@ mw->priv->accel, mw->priv->statusbar); diff -Nru ekiga-3.2.7/debian/rules ekiga-3.2.7/debian/rules --- ekiga-3.2.7/debian/rules 2011-08-07 19:12:28.000000000 +0700 +++ ekiga-3.2.7/debian/rules 2011-08-07 19:10:56.000000000 +0700 @@ -34,8 +34,6 @@ patch: patch-stamp patch-stamp: dh_testdir - # apply patches - $(QUILT) push -a || test $$? = 2 # backup the original files to restore them in the clean target [ ! -r config.sub ] || cp config.sub config.sub.orig [ ! -r config.guess ] || cp config.guess config.guess.orig @@ -64,9 +62,6 @@ [ ! -e config.sub.orig ] || mv -f config.sub.orig config.sub [ ! -e config.guess.orig ] || mv -f config.guess.orig config.guess [ ! -e gnome-doc-utils.make.orig ] || mv -f gnome-doc-utils.make.orig gnome-doc-utils.make - # unapply patches, if any - $(QUILT) pop -a -R || test $$? = 2 - -$(RM) -rf .pc -$(RM) -f build-stamp patch-stamp dh_clean diff -Nru ekiga-3.2.7/debian/source/format ekiga-3.2.7/debian/source/format --- ekiga-3.2.7/debian/source/format 1970-01-01 07:00:00.000000000 +0700 +++ ekiga-3.2.7/debian/source/format 2011-07-10 02:28:50.000000000 +0700 @@ -0,0 +1 @@ +3.0 (quilt)