diff -u ekiga-3.2.7/debian/control ekiga-3.2.7/debian/control --- ekiga-3.2.7/debian/control +++ ekiga-3.2.7/debian/control @@ -6,8 +6,9 @@ Source: ekiga Section: gnome Priority: optional -Maintainer: Kilian Krause -Uploaders: Jose Carlos Garcia Sogo , Eugen Dedu , Debian GNOME Maintainers , Josselin Mouette +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Kilian Krause +Uploaders: Jose Carlos Garcia Sogo , Eugen Dedu , Debian GNOME Maintainers , Kilian Krause Build-Depends: debhelper (>= 7), libsasl2-dev, gettext, @@ -33,11 +34,13 @@ libebook1.2-dev, libxext-dev, automake, - autoconf -# quilt, + 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/ +XS-Debian-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/ekiga +XS-Debian-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/ +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/ekiga/lucid Homepage: http://www.ekiga.org DM-Upload-Allowed: yes diff -u ekiga-3.2.7/debian/control.in ekiga-3.2.7/debian/control.in --- ekiga-3.2.7/debian/control.in +++ ekiga-3.2.7/debian/control.in @@ -1,7 +1,8 @@ Source: ekiga Section: gnome Priority: optional -Maintainer: Kilian Krause +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Kilian Krause Uploaders: Jose Carlos Garcia Sogo , Eugen Dedu , @GNOME_TEAM@ Build-Depends: debhelper (>= 7), libsasl2-dev, @@ -28,11 +29,13 @@ libebook1.2-dev, libxext-dev, automake, - autoconf -# quilt, + 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/ +XS-Debian-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/ekiga +XS-Debian-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/ +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/ekiga/lucid Homepage: http://www.ekiga.org DM-Upload-Allowed: yes diff -u ekiga-3.2.7/debian/changelog ekiga-3.2.7/debian/changelog --- ekiga-3.2.7/debian/changelog +++ ekiga-3.2.7/debian/changelog @@ -1,3 +1,15 @@ +ekiga (3.2.7-2ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #597869), remaining changes: + - debian/control: Clarify Vcs-*; enable launchpad-integration and + quilt. + - debian/patches/ubuntu_lpi.patch: Launchpad integration. + - debian/rules: Run autoreconf during build. + * Dropped changes: + - Use the correct debian/watch file: fixed in debian + + -- Lorenzo De Liso Wed, 23 Jun 2010 23:25:21 +0200 + ekiga (3.2.7-2) unstable; urgency=high * Setting urgency=high due to fixing RC bug @@ -18,6 +30,17 @@ -- Kilian Krause Tue, 01 Jun 2010 17:42:24 +0200 +ekiga (3.2.6-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + + debian/control: Clarify Vcs-*; enable launchpad-integration and + quilt. + + debian/patches/ubuntu_lpi.patch: Launchpad integration. + + debian/rules: Run autoreconf during build. + * Use the correct debian/watch file. + + -- Daniel T Chen Wed, 03 Feb 2010 18:52:56 -0500 + ekiga (3.2.6-1) unstable; urgency=low * New upstream release @@ -26,6 +49,18 @@ -- Kilian Krause Tue, 06 Oct 2009 21:39:45 +0200 +ekiga (3.2.5-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - debian/patches/ubuntu_lpi.patch: Launchpad integration. + - Run autoreconf during build. + * Ubuntu changes dropped: + - Replace libpt2.6.1-dev with libpt-dev in the Build-Depends. + * Enable quilt usage again. + + -- Steve Kowalik Wed, 22 Jul 2009 16:04:41 +1000 + ekiga (3.2.5-1) unstable; urgency=high * New upstream release (Closes: #536021, #530706, #531684, #531686, @@ -64,6 +99,104 @@ -- Kilian Krause Thu, 21 May 2009 23:08:34 +0200 +ekiga (3.2.0-0ubuntu3) karmic; urgency=low + + * debian/patches/ubuntu_desktop-file-onlyshowin.patch: Dropped, was only + needed for Ubuntu Mobile in Hardy, and has caused other issues. + (LP: #376077) + * Replace libpt2.6.1-dev with libpt-dev in the Build-Depends. + + -- Steve Kowalik Wed, 03 Jun 2009 19:49:00 +1000 + +ekiga (3.2.0-0ubuntu2) jaunty-proposed; urgency=low + + * debian/patches/dial_with_no_valid_accounts_crash.patch: + - Fix crash when dialing with no valid accounts (LP: #352041) + + -- Robert Ancell Fri, 01 May 2009 10:14:36 +1000 + +ekiga (3.2.0-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #341367) + - Better NAT support in case of Cone NAT + - Uniformise detection of libnotify; fix compilation with mingw + - Fix "URL completion combobox shows identical completions" + - Fix "Assistant loosing values when going backward" + - Fix GmConf settings when compiled with another package name + - Fix unregistration of accounts + - Fix build with --enable-kde + - Fixed possible crash when retrieving presence information + - New translations: crh, or + - Updated translations: as, bg, bn_IN, da, de, el, eu, gl, gu, hi, hu, + ja, kn, ko, ku, lt, ml, mr, or, pt, ro, ru, ta, te, tr + - New help translation: en_GB + - Updated help translation: fr + - Better NAT support in case of Cone NAT + - There is now only one H.263 plugin implementing both H.263 and H.263+ + - Allow several ALSA devices to have the same name + - Added support for the G.722 audio codec: G.722 is a 16 kHz wideband + audio codec advertised as HD Voice by the famous Polycom. It is a + great boost in quality and interoperability + - Added support for the CELT ultral-low delay audio codec: CELT delivers + high quality audio at 32 kHz or 48 kHz, allowing to transmit music in + high quality, with low delay and low bitrate + - Added support for SIP dialog-info notifications: they allow displaying + notifications of incoming calls in the roster. With software like + kamailio or Asterisk, it allows being informed of incoming calls + reaching your colleagues + - Largely improved LDAP support: the OpenLDAP guys contributed several + patches to provide state-of-the-art LDAP support in the Ekiga address + book. The new code even supports authentication + - Killed the gconf_test_age test, Ekiga can now finally work with + badly installed GConf schemas + - Better handling of multiple network interfaces with dynamic addition + and removal + - Added settings migration from Ekiga 2.0.x. + - Other various fixes, cleanups, removal of deprecated symbols etc. + - New translations: crh, or + - New help translation: en_GB, eu + - Updated many translations and help + - Experimental features: + * Significant improvements in IPv6 support + * Gstreamer audio and video capture support near to be finished... + * debian/patches/migrate_2.0_settings.patch: + - Removed, migration is now upstream + * debian/patches/00_news.patch + - Removed + * debian/patches/ubuntu_lpi.patch: + - Modified to work with 3.2 + + -- Ken VanDine Tue, 17 Mar 2009 15:14:12 -0400 + +ekiga (3.0.1-1ubuntu2) jaunty; urgency=low + + * debian/rules: Replace translations in gconf schemas with gettext domain. + + -- Martin Pitt Mon, 09 Mar 2009 15:34:50 +0100 + +ekiga (3.0.1-1ubuntu1) jaunty; urgency=low + + * Merge to Debian experimental, to get Ekiga 3. (LP: #274085) Remaining + Ubuntu changes: + - Launchpad Integration: (Ubuntu specific) + + debian/control.in: Add liblaunchpad-integration-dev build dependency. + + Add ubuntu_lpi.patch: Call launchpad_integration_add_items() in main() and + check for the launchpad-integration pkg-config module. + + Add autoconf.patch: autoconf changes from above patch. + - Add ubuntu_desktop-file-onlyshowin.patch: Show ekiga in Mobile, too. + (Ubuntu specific). + - debian/control.in: Add missing fdupes build dependency for identical + GNOME help file symlinking. (Debian #505536) + * Drop 42_change_pixmaps.dpatch: Many of the old icons do not exist any + more, some have been replaced, and keeping the remaining three would make + them look very inconsistent. + * Convert our dpatches to quilt patches and rewrite them for new upstream + version. + * Add migrate_2.0_settings.patch: Properly migrate settings from + 2.0. Taken from upstream SVN, thanks to Damien Sandras! + + -- Martin Pitt Sun, 07 Dec 2008 10:30:45 -0800 + ekiga (3.0.1-1) experimental; urgency=low [ Eugen Dedu ] @@ -100,6 +233,29 @@ -- Eugen Dedu Sat, 27 Sep 2008 10:00:00 +0200 +ekiga (2.0.12-1+nmu1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Launchpad Integration: (Ubuntu specific) + + debian/control.in: Add liblaunchpad-integration-dev build dependency. + + Add 01_lpi.dpatch: Call launchpad_integration_add_items() in main() and + check for the launchpad-integration pkg-config module. + + Add 02_autoconf.dpatch: autoconf changes from above patch. + - Update icons: (Ubuntu specific) + + Add 42_change_pixmaps.dpatch shipping the debian/patched-icons dir. + + debian/rules: uudecode debian/patched-icons in the config.status rule; + rm these in clean. + - Add desktop-file-onlyshowin.dpatch: Show ekiga in Mobile, too. (Ubuntu + specific). + - D-BUS support: (Debian #467212) + + debian/rules: configure with --enable-dbus. + + deiban/control.in: Add libdbus-glib-1-dev build dep. + - debian/rules: Create a PO template on build. (Debian #505535) + - debian/rules: symlink identical Gnome help files within packages. Add + fdupes build dependency for this. (Forwarded to Debian #505536) + + -- Martin Pitt Thu, 13 Nov 2008 13:14:43 +0100 + ekiga (2.0.12-1+nmu1) unstable; urgency=low * Non-maintainer upload. diff -u ekiga-3.2.7/debian/rules ekiga-3.2.7/debian/rules --- ekiga-3.2.7/debian/rules +++ ekiga-3.2.7/debian/rules @@ -35,7 +35,7 @@ patch-stamp: dh_testdir # apply patches - ###$(QUILT) push -a || test $$? = 2 + $(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 @@ -50,6 +50,7 @@ build-stamp: patch-stamp dh_testdir rm -f config.cache + autoreconf CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure $(confflags) $(MAKE) $(MAKEFLAGS) @@ -64,7 +65,7 @@ [ ! -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 + $(QUILT) pop -a -R || test $$? = 2 -$(RM) -rf .pc -$(RM) -f build-stamp patch-stamp dh_clean only in patch2: unchanged: --- ekiga-3.2.7.orig/debian/patches/series +++ ekiga-3.2.7/debian/patches/series @@ -0,0 +1 @@ +ubuntu_lpi.patch only in patch2: unchanged: --- ekiga-3.2.7.orig/debian/patches/ubuntu_lpi.patch +++ ekiga-3.2.7/debian/patches/ubuntu_lpi.patch @@ -0,0 +1,71 @@ +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 @@ + + + dnl ############################### ++dnl Launchpad support ++dnl ############################### ++LP="disabled" ++ ++if test "x${gm_platform}" != "xmingw" ; then ++ AC_ARG_ENABLE(launchpad, [ --disable-launchpad Disable launchpad integration],,enable_launchpad=yes) ++ ++ if test "x$enable_launchpad" = "xyes"; then ++ PKG_CHECK_MODULES([LP], [launchpad-integration], [found_launchpad=yes]) ++ AC_SUBST(LP_CFLAGS) ++ AC_SUBST(LP_LIBS) ++ LP="enabled" ++ AC_DEFINE(HAVE_LP,1,[LP support]) ++ fi ++fi ++AM_CONDITIONAL(HAVE_LP, test "x$found_launchpad" = "xyes") ++ ++ ++dnl ############################### + dnl GNOME support + dnl ############################### + GNOME="disabled" +@@ -799,6 +818,7 @@ + echo " GConf support : $GCONF" + echo " Evolution-Data-Server support : $EDS" + echo " NOTIFY support : $NOTIFY" ++echo " Launchpad integration : $LP" + 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 @@ + 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) ++AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS) $(LP_CFLAGS) ++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 +@@ -35,6 +35,8 @@ + * build the main window. + */ + ++#include ++ + #include "revision.h" + + #include "config.h" +@@ -3285,6 +3287,7 @@ + mw->priv->accel, + mw->priv->statusbar); + ++ launchpad_integration_add_items (gtk_widget_get_parent (gtk_menu_get_widget (mw->priv->main_menu, "about")), -1, TRUE, TRUE); + gtk_widget_show_all (GTK_WIDGET (mw->priv->main_menu)); + } +