[Pkg-telepathy-commits] [empathy] 35/39: Refresh patches through gbp-pq; add DEP-3 origin metadata
Simon McVittie
smcv at debian.org
Wed Jan 29 12:53:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository empathy.
commit 6b167b57d5d7146f359c05190c01724b3e197a73
Author: Simon McVittie <smcv at debian.org>
Date: Wed Jan 29 09:23:30 2014 +0000
Refresh patches through gbp-pq; add DEP-3 origin metadata
---
debian/changelog | 1 +
...e-new-api-versioned-name-for-geocode-glib.patch | 30 +++++++++---------
...ocodeLocation-API-in-geocode-glib-0.99.1.patch} | 36 ++++++++++++----------
debian/patches/0003-Add-missing-include.patch | 26 ++++++++--------
.../0004-Template.html-remove-DOCTYPE.patch | 9 ++----
debian/patches/series | 2 +-
6 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f966b28..2839fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
empathy (3.8.6-1) UNRELEASED; urgency=medium
* New upstream release
+ * Refresh patches through gbp-pq; add DEP-3 origin metadata
-- Simon McVittie <smcv at debian.org> Wed, 29 Jan 2014 09:15:05 +0000
diff --git a/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch b/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch
index e0aeb83..2be483f 100644
--- a/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch
+++ b/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch
@@ -1,20 +1,22 @@
-commit 4682c05ce90708e89c8690d4fb395fcee73b9d71
-Author: Andreas Henriksson <andreas at fatal.se>
-Date: Wed Aug 14 20:40:48 2013 +0200
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Wed, 14 Aug 2013 20:40:48 +0200
+Subject: Use new api-versioned name for geocode-glib
- Use new api-versioned name for geocode-glib
-
- geocode-glib has changed the name of the pkg-config file
- to include the api version. Update configure script accordingly.
-
- See:
- https://git.gnome.org/browse/geocode-glib/commit/?id=1cadaa879b7d72d973880680b5f947fd5c275974
- "pkg-config: Version the pkg-config file"
-
- https://bugzilla.gnome.org/show_bug.cgi?id=706020
+geocode-glib has changed the name of the pkg-config file
+to include the api version. Update configure script accordingly.
+
+See:
+https://git.gnome.org/browse/geocode-glib/commit/?id=1cadaa879b7d72d973880680b5f947fd5c275974
+"pkg-config: Version the pkg-config file"
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=706020
+Origin: upstream, 3.9.90, commit:4682c05ce90708e89c8690d4fb395fcee73b9d71
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index d71de75..b0228ec 100644
+index 1fb16a7..ed22f0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,7 @@ AC_ARG_ENABLE(geocode,
diff --git a/debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch b/debian/patches/0002-Use-new-GeocodeLocation-API-in-geocode-glib-0.99.1.patch
similarity index 58%
rename from debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
rename to debian/patches/0002-Use-new-GeocodeLocation-API-in-geocode-glib-0.99.1.patch
index 872223e..e9ea163 100644
--- a/debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
+++ b/debian/patches/0002-Use-new-GeocodeLocation-API-in-geocode-glib-0.99.1.patch
@@ -1,24 +1,26 @@
-commit acaa1e4f9d2c5e746e895a7ca3e6002ac502cc2a
-Author: Andreas Henriksson <andreas at fatal.se>
-Date: Wed Aug 14 21:44:24 2013 +0200
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Wed, 14 Aug 2013 21:44:24 +0200
+Subject: Use new GeocodeLocation API in geocode-glib 0.99.1
- Use new GeocodeLocation API in geocode-glib 0.99.1
-
- Use new accessor functions. The location structure members has been hidden.
- Use regular g_object_unref, since the geocode_location_free has been
- removed.
-
- See:
- https://git.gnome.org/browse/geocode-glib/commit?id=5372f2f7ff97707dcc839bd3ed79ea9f289f7409
- "lib: Turn GeocodeLocation into a proper GObject"
-
- https://bugzilla.gnome.org/show_bug.cgi?id=706020
+Use new accessor functions. The location structure members has been hidden.
+Use regular g_object_unref, since the geocode_location_free has been
+removed.
+
+See:
+https://git.gnome.org/browse/geocode-glib/commit?id=5372f2f7ff97707dcc839bd3ed79ea9f289f7409
+"lib: Turn GeocodeLocation into a proper GObject"
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=706020
+Origin: upstream, 3.9.90, commit:acaa1e4f9d2c5e746e895a7ca3e6002ac502cc2a
+---
+ libempathy/empathy-contact.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
-index 3561044..8f9cb16 100644
+index 3c91e63..e021aa0 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
-@@ -1617,7 +1617,6 @@ geocode_cb (GObject *source,
+@@ -1616,7 +1616,6 @@ geocode_cb (GObject *source,
GeocodeLocation *loc;
GHashTable *new_location;
GHashTable *resolved = NULL;
@@ -26,7 +28,7 @@ index 3561044..8f9cb16 100644
if (priv->location == NULL)
goto out;
-@@ -1635,14 +1634,14 @@ geocode_cb (GObject *source,
+@@ -1634,14 +1633,14 @@ geocode_cb (GObject *source,
loc = res->data;
new_location = tp_asv_new (
diff --git a/debian/patches/0003-Add-missing-include.patch b/debian/patches/0003-Add-missing-include.patch
index 312e842..eea26ac 100644
--- a/debian/patches/0003-Add-missing-include.patch
+++ b/debian/patches/0003-Add-missing-include.patch
@@ -1,20 +1,22 @@
-commit 1158a1e2814e74ce115cfa201fd8a908a79cbd7e
-Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
-Date: Fri Aug 16 13:43:00 2013 +0200
+From: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
+Date: Fri, 16 Aug 2013 13:43:00 +0200
+Subject: Add missing include
- Add missing include
-
- Needed for EMPATHY_LOCATION_*.
-
- Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
-
- https://bugzilla.gnome.org/show_bug.cgi?id=706125
+Needed for EMPATHY_LOCATION_*.
+
+Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=706125
+Origin: upstream, 3.9.90, commit:1158a1e2814e74ce115cfa201fd8a908a79cbd7e
+---
+ libempathy/empathy-contact.c | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
-index 8f9cb16..9f8e232 100644
+index e021aa0..618e72e 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
#include <geocode-glib/geocode-glib.h>
#endif
diff --git a/debian/patches/0004-Template.html-remove-DOCTYPE.patch b/debian/patches/0004-Template.html-remove-DOCTYPE.patch
index d39637e..c1f361c 100644
--- a/debian/patches/0004-Template.html-remove-DOCTYPE.patch
+++ b/debian/patches/0004-Template.html-remove-DOCTYPE.patch
@@ -1,7 +1,6 @@
-From c2e916b5226ef76ce686119b79d1f49574e5c480 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Mon, 16 Sep 2013 17:17:09 +0200
-Subject: [PATCH] Template.html: remove DOCTYPE
+Subject: Template.html: remove DOCTYPE
This ensures that WebKit considers the document in 'quirks' mode which is now
needed when using document.body.scrollTop (used to check if we should scroll
@@ -9,7 +8,8 @@ down or not when adding a new message).
See https://bugs.webkit.org/show_bug.cgi?id=121419 for details.
-https://bugzilla.gnome.org/show_bug.cgi?id=707781
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=707781
+Origin: upstream, 3.9.92, commit:c2e916b5226ef76ce686119b79d1f49574e5c480
---
data/Template.html | 1 -
1 file changed, 1 deletion(-)
@@ -23,6 +23,3 @@ index 79224b8..295ba8b 100644
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
---
-1.8.4.rc3
-
diff --git a/debian/patches/series b/debian/patches/series
index 67ac413..cac785e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
0001-Use-new-api-versioned-name-for-geocode-glib.patch
-0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
+0002-Use-new-GeocodeLocation-API-in-geocode-glib-0.99.1.patch
0003-Add-missing-include.patch
0004-Template.html-remove-DOCTYPE.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git
More information about the Pkg-telepathy-commits
mailing list