Hi,
I plan to upload geoclue as NMU with the attached patch within the next days if
there're no objections against it.
Cheers,
Bernd
--
Bernd Zeimetz Debian GNU/Linux Developer
GPG Fingerprint: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
c235b108822e7744d8d636d63d74a1b38f0adcc8
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e37ca52
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+* The packaging of geoclue uses quilt to manage patches
+ at build time. Please install the package 'quilt' and see
+ /usr/share/doc/quilt/README.source
+ for details.
diff --git a/debian/changelog b/debian/changelog
index ecd2e7b..8b3b470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+geoclue (0.11.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Adding quilt patch system and a patch to fix a FTBFS due to a changed
+ API of libgammu (Closes: #518586). Also adding debian/README.source
+ as required by policy.
+
+ -- Bernd Zeimetz <b...@debian.org> Wed, 25 Mar 2009 20:20:54 +0100
+
geoclue (0.11.1-1) unstable; urgency=low
* New upstream version (stable)
diff --git a/debian/control b/debian/control
index 08ccb5b..8d0313e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: geoclue
Section: utils
Priority: optional
Maintainer: Craig Andrews <candr...@integralblue.com>
-Build-Depends: debhelper (>= 4), libtool, libgconf2-dev, libgtk2.0-dev,
libdbus-glib-1-dev, libgps-dev, libsoup2.2-dev, libxml2-dev,
network-manager-dev, libgammu-dev, xsltproc
+Build-Depends: debhelper (>= 4), libtool, libgconf2-dev, libgtk2.0-dev,
libdbus-glib-1-dev, libgps-dev, libsoup2.2-dev, libxml2-dev,
network-manager-dev, libgammu-dev, xsltproc, quilt
Standards-Version: 3.8.0
Package: geoclue
@@ -15,7 +15,6 @@ Description: Geographic information framework
sources using a D-Bus api or a C library.
.
This package contains the master server for GeoClue.
- .
Package: libgeoclue0
Section: libs
diff --git a/debian/patches/GSM_FindGammuRC_api.diff
b/debian/patches/GSM_FindGammuRC_api.diff
new file mode 100644
index 0000000..a91fd02
--- /dev/null
+++ b/debian/patches/GSM_FindGammuRC_api.diff
@@ -0,0 +1,11 @@
+--- a/providers/gsmloc/geoclue-gsmloc.c
++++ b/providers/gsmloc/geoclue-gsmloc.c
+@@ -104,7 +104,7 @@ static gboolean geoclue_gsmloc_get_cell
+ }
+
+ /* Find and read configuration file */
+- error = GSM_FindGammuRC (&cfg);
++ error = GSM_FindGammuRC (&cfg, NULL);
+ if (error != ERR_NONE) {
+ g_printerr ("Gammu error: %s\n", GSM_ErrorString (error));
+ if (GSM_IsConnected (state)) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3ea5fce
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+GSM_FindGammuRC_api.diff
diff --git a/debian/rules b/debian/rules
index b2ade0c..c877852 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
+
package = geoclue
CFLAGS = -Wall -g
@@ -18,7 +21,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture
-qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
dh_testdir
ln -sf /usr/share/misc/config.sub config.sub
ln -sf /usr/share/misc/config.guess config.guess
@@ -31,7 +34,8 @@ build-stamp: configure-stamp
$(MAKE) CFLAGS="$(CFLAGS)"
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
if [ -f Makefile ]; then $(MAKE) -i distclean; fi;
