--- ubuntu-geoip-1.0.1.orig/configure.ac +++ ubuntu-geoip-1.0.1/configure.ac @@ -37,6 +37,7 @@ PKG_CHECK_MODULES(PROVIDER, glib-2.0 >= $GLIB_REQUIRED_VERSION geoclue >= GEOCLUE_REQUIRED_VERSION libsoup-2.4 >= SOUP_REQUIRED_VERSION + libsoup-gnome-2.4 >= SOUP_REQUIRED_VERSION libnm-glib >= NM_REQUIRED_VERSION) AC_SUBST(PROVIDER_CFLAGS) --- ubuntu-geoip-1.0.1.orig/debian/copyright +++ ubuntu-geoip-1.0.1/debian/copyright @@ -0,0 +1,21 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: ubuntu-geoip +Maintainer: Ted Gould +Source: https://launchpad.net/ubuntu-geoip + +Copyright: 2010 Canonical Ltd +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + On Debian/Ubuntu systems, the full text of the full text of the GPL v3 can be + found in `/usr/share/common-licenses/GPL-3' --- ubuntu-geoip-1.0.1.orig/debian/changelog +++ ubuntu-geoip-1.0.1/debian/changelog @@ -0,0 +1,129 @@ +ubuntu-geoip (1.0.1-0ubuntu5) saucy; urgency=low + + * Backport r35 to fix build in saucy + + -- Sebastien Bacher Mon, 24 Jun 2013 17:11:43 +0200 + +ubuntu-geoip (1.0.1-0ubuntu4) raring; urgency=low + + * Backport upstream commits: + - Fix ordering of parameters (lp: #1067037) + - support for proxies (lp: #1130097) + * debian/control: + - Build-depends on libsoup-gnome2.4-dev + + -- Sebastien Bacher Fri, 15 Mar 2013 11:53:53 +0100 + +ubuntu-geoip (1.0.1-0ubuntu3) raring; urgency=low + + * Don't use deprecated g_type_init() with recent glib2.0. + + -- Matthias Klose Tue, 26 Feb 2013 10:46:13 +0100 + +ubuntu-geoip (1.0.1-0ubuntu2) raring; urgency=low + + * debian/control: build-depends on libdbustest1-dev + + -- Sebastien Bacher Mon, 12 Nov 2012 18:58:26 +0100 + +ubuntu-geoip (1.0.1-0ubuntu1) raring; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 12 Nov 2012 18:31:31 +0100 + +ubuntu-geoip (1.0.0-0ubuntu1) quantal; urgency=low + + [ Ted Gould ] + * New upstream release. + * Clearing cached data when we loose networking + * Fixing a bug with NM status + * Providing updates instead of cacheable for better Master work + * NM Status updates + * Adding a setting for the URL + * debian/rules: Autoreconf love + * debian/patches: Dropping as moved upstream + + [ Ken VanDine ] + * debian/control + - build depend on dh-autoreconf + + -- Ken VanDine Fri, 14 Sep 2012 18:10:28 -0400 + +ubuntu-geoip (0.0.2-0ubuntu6) oneiric; urgency=low + + * debian/patches/NM_0_9_api.patch: update to support the new NM 0.9 API. + * debian/control: bump libnm-glib-dev Build-Depends to (>= 0.8.998). + + -- Mathieu Trudel-Lapierre Wed, 29 Jun 2011 09:54:50 -0400 + +ubuntu-geoip (0.0.2-0ubuntu5) natty; urgency=low + + * Per RFC 2616 use upper case for GET request thanks to Andrew Glen-Young + for the patch (LP: #719324) + + -- Brian Murray Fri, 04 Mar 2011 13:58:56 -0800 + +ubuntu-geoip (0.0.2-0ubuntu4) natty; urgency=low + + * debian/control + - Set Vcs-Bzr + + -- Ken VanDine Tue, 08 Feb 2011 11:15:10 -0500 + +ubuntu-geoip (0.0.2-0ubuntu3) natty; urgency=low + + * debian/control + - Provide geoclue-provider + + -- Ken VanDine Tue, 08 Feb 2011 10:55:42 -0500 + +ubuntu-geoip (0.0.2-0ubuntu2) natty; urgency=low + + * debian/watch + * Added watch file + + -- Ken VanDine Mon, 15 Nov 2010 10:33:26 -0500 + +ubuntu-geoip (0.0.2-0ubuntu1) natty; urgency=low + + * debian/control + * Added extended description + * Bump standards version to 3.9.1 + * set the package name to geoclue-ubuntu-geoip, to match other providers + * debian/copyright + * Added copyright file + * Switch to dpkg-source 3.0 (quilt) format + + -- Ken VanDine Mon, 15 Nov 2010 08:59:29 -0500 + +ubuntu-geoip (0.0.2-0ubuntu1~ppa1) maverick; urgency=low + + * New upstream release. + * Retrying when we have web blockers + * Adding in support for network connection + * Adding in an address provider + * debian/control: Adding dep on libnm-glib-dev + + -- Ted Gould Thu, 21 Oct 2010 17:23:35 -0400 + +ubuntu-geoip (0.0.0-0ubuntu1~ppa3) maverick; urgency=low + + * Upstream Merge + * Get data from the network and siganl provider changes + + -- Ted Gould Wed, 06 Oct 2010 09:59:03 -0600 + +ubuntu-geoip (0.0.0-0ubuntu1~ppa2) maverick; urgency=low + + * Upstream Merge + * Stub provider + + -- Ted Gould Tue, 05 Oct 2010 17:03:38 -0600 + +ubuntu-geoip (0.0.0-0ubuntu1~ppa1) maverick; urgency=low + + * Initial packaging. + * Provides a geoclue provider for Ubuntu GeoIP services + + -- Ted Gould Tue, 05 Oct 2010 14:33:09 -0600 --- ubuntu-geoip-1.0.1.orig/debian/rules +++ ubuntu-geoip-1.0.1/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/autoreconf.mk + --- ubuntu-geoip-1.0.1.orig/debian/control +++ ubuntu-geoip-1.0.1/debian/control @@ -0,0 +1,32 @@ +Source: ubuntu-geoip +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + intltool, + gnome-common, + pkg-config, + libglib2.0-dev, + libsoup2.4-dev, + libsoup-gnome2.4-dev, + libgeoclue-dev, + libnm-glib-dev (>= 0.8.998), + dh-autoreconf, + libdbustest1-dev +Standards-Version: 3.9.1 +Homepage: https://launchpad.net/ubuntu-geoip +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/ubuntu-geoip/ubuntu + +Package: geoclue-ubuntu-geoip +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + geoclue +Provides: geoclue-provider +Description: Provide positioning for GeoClue via Ubuntu GeoIP services + GeoClue provides applications access to various geographical information + sources using a D-Bus API or a C library. + . + This package provides a positioning backend for GeoClue. + It uses the IP geolocation database (http://geoip.ubuntu.com/lookup). --- ubuntu-geoip-1.0.1.orig/debian/watch +++ ubuntu-geoip-1.0.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/ubuntu-geoip/+download .*/ubuntu-geoip-([0-9.]+)\.tar\.gz --- ubuntu-geoip-1.0.1.orig/src/ubuntu-geoip-provider.c +++ ubuntu-geoip-1.0.1/src/ubuntu-geoip-provider.c @@ -34,7 +34,7 @@ #include /* Soup */ -#include +#include /* Network Manager */ #include @@ -252,6 +252,7 @@ /* Allocate */ if (test_data == NULL) { self->priv->soup = soup_session_async_new(); + soup_session_add_feature_by_type(self->priv->soup, soup_proxy_resolver_default_get_type()); self->priv->client = nm_client_new(); g_signal_connect(G_OBJECT(self->priv->client), "notify::" NM_CLIENT_STATE, G_CALLBACK(nm_state_change), self); @@ -612,8 +613,8 @@ GeoclueAccuracy * accuracy = position_accuracy_build(provider); gc_iface_position_emit_position_changed(GC_IFACE_POSITION(provider), - time(NULL), GEOCLUE_POSITION_FIELDS_LATITUDE | GEOCLUE_POSITION_FIELDS_LONGITUDE, + time(NULL), provider->priv->latitude, provider->priv->longitude, 0, /* Altitude */ @@ -1033,7 +1034,9 @@ GError * error = NULL; GOptionContext * context; +#if !GLIB_CHECK_VERSION (2, 35, 1) g_type_init(); +#endif context = g_option_context_new("- Get the location of the machine using GeoIP and report it through GeoClue");