Control: tags -1 +patch +pending X-Debbugs-CC: sjo...@debian.org po...@debian.org bi...@debian.org
Dear maintainer,
I've prepared an NMU for telepathy-logger (versioned as 0.8.2-4.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru telepathy-logger-0.8.2/debian/changelog
telepathy-logger-0.8.2/debian/changelog
--- telepathy-logger-0.8.2/debian/changelog 2019-11-08 10:54:02.000000000
-0500
+++ telepathy-logger-0.8.2/debian/changelog 2024-10-11 15:09:20.000000000
-0400
@@ -1,3 +1,25 @@
+telepathy-logger (0.8.2-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Boyuan Yang ]
+ * debian/patches/backport/2e50d1855b3395b622c768094ff2b617a0208724.patch:
+ Add upstream patch to fix FTBFS against GCC 14. (Closes: #1075559)
+ * debian/patches/backport/5eaf8c99748b3d4e61afaba24ff6bf763f81695d.patch:
+ Add upstream patch to match upstream trunk as of 2024-08-01.
+ * debian/gbp.conf: Rename to modern section name to avoid gbp warning.
+ * debian/control: Avoid using obsolete package pkg-config => pkgconf.
+
+ [ Laurent Bigonville ]
+ * debian/control: Mark the -doc package with Build-Profiles: <!nodoc>
+ * debian/control: Add libglib2.0-doc and libtelepathy-glib-doc to the
+ Build-depend-indep, this is needed to properly resolve the links in the
+ documentation
+ * debian/control: Remove Dafydd Harries from uploaders.
+ Thanks for your past work on this package! (Closes: #965396)
+
+ -- Boyuan Yang <by...@debian.org> Fri, 11 Oct 2024 15:09:20 -0400
+
telepathy-logger (0.8.2-4) unstable; urgency=medium
* debian/patches/sync_tools_with_tp-glib_master.patch: Fix FTBFS with
diff -Nru telepathy-logger-0.8.2/debian/control
telepathy-logger-0.8.2/debian/control
--- telepathy-logger-0.8.2/debian/control 2019-11-08 10:54:02.000000000
-0500
+++ telepathy-logger-0.8.2/debian/control 2024-10-11 15:09:20.000000000
-0400
@@ -2,8 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian Telepathy maintainers
<pkg-telepathy-maintain...@lists.alioth.debian.org>
-Uploaders: Dafydd Harries <d...@debian.org>,
- Sjoerd Simons <sjo...@debian.org>,
+Uploaders: Sjoerd Simons <sjo...@debian.org>,
Laurent Bigonville <bi...@debian.org>,
Emilio Pozuelo Monfort <po...@debian.org>
Build-Depends: dbus,
@@ -20,8 +19,9 @@
libsqlite3-dev,
libtelepathy-glib-dev (>= 0.19.2),
libxml2-dev,
- pkg-config,
+ pkgconf,
python3:any
+Build-Depends-Indep: libglib2.0-doc <!nodoc>, libtelepathy-glib-doc <!nodoc>
Standards-Version: 4.4.1
Vcs-Git: https://salsa.debian.org/telepathy-team/telepathy-logger.git
Vcs-Browser: https://salsa.debian.org/telepathy-team/telepathy-logger
@@ -63,7 +63,7 @@
libdbus-glib-1-dev (>= 0.11.5),
libglib2.0-dev (>= 2.22),
libtelepathy-logger3 (= ${binary:Version}),
- pkg-config,
+ pkgconf,
${misc:Depends}
Suggests: libtelepathy-logger-doc
Multi-Arch: same
@@ -82,6 +82,7 @@
Depends: ${misc:Depends}
Suggests: devhelp
Multi-Arch: foreign
+Build-Profiles: <!nodoc>
Description: Telepathy logger service -- documentation
This package contains HTML documentation for the Telepathy logger utility
library.
diff -Nru telepathy-logger-0.8.2/debian/gbp.conf
telepathy-logger-0.8.2/debian/gbp.conf
--- telepathy-logger-0.8.2/debian/gbp.conf 2019-11-08 10:54:02.000000000
-0500
+++ telepathy-logger-0.8.2/debian/gbp.conf 2024-10-11 15:09:20.000000000
-0400
@@ -3,7 +3,7 @@
upstream-branch = upstream
pristine-tar = True
-[git-buildpackage]
+[buildpackage]
tarball-dir = ../tarballs/
export-dir = ../build-area/
compression = bzip2
diff -Nru
telepathy-logger-0.8.2/debian/patches/backport/2e50d1855b3395b622c768094ff2b617a0208724.patch
telepathy-logger-
0.8.2/debian/patches/backport/2e50d1855b3395b622c768094ff2b617a0208724.patch
---
telepathy-logger-0.8.2/debian/patches/backport/2e50d1855b3395b622c768094ff2b617a0208724.patch
1969-12-31 19:00:00.000000000 -0500
+++
telepathy-logger-0.8.2/debian/patches/backport/2e50d1855b3395b622c768094ff2b617a0208724.patch
2024-10-11 15:09:20.000000000 -0400
@@ -0,0 +1,58 @@
+From 2e50d1855b3395b622c768094ff2b617a0208724 Mon Sep 17 00:00:00 2001
+From: Balló György <ballog...@gmail.com>
+Date: Thu, 1 Aug 2024 19:26:43 +0200
+Subject: Fix incompatible pointer types
+
+gcc14 defaults to -Werror=incompatible-pointer-types .
+Fix build error with this option.
+
+Bug-Debian: https://bugs.debian.org/1075559
+Applied-Upstream:
https://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=2e50d1855b3395b622c768094ff2b617a0208724
+---
+ telepathy-logger/conf.c | 2 +-
+ telepathy-logger/dbus-service.c | 2 +-
+ telepathy-logger/log-manager.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/telepathy-logger/conf.c b/telepathy-logger/conf.c
+index 888114d..9aaa222 100644
+--- a/telepathy-logger/conf.c
++++ b/telepathy-logger/conf.c
+@@ -132,7 +132,7 @@ tpl_conf_constructor (GType type,
+
+ if (conf_singleton != NULL)
+ {
+- retval = g_object_ref (conf_singleton);
++ retval = g_object_ref (G_OBJECT (conf_singleton));
+ }
+ else
+ {
+diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
+index ee3c353..5f8c158 100644
+--- a/telepathy-logger/dbus-service.c
++++ b/telepathy-logger/dbus-service.c
+@@ -97,7 +97,7 @@ favourite_contact_closure_new (TplDBusService *self,
+ FavouriteContactClosure *closure;
+
+ closure = g_slice_new0 (FavouriteContactClosure);
+- closure->service = g_object_ref (G_OBJECT (self));
++ closure->service = TPL_DBUS_SERVICE (g_object_ref (G_OBJECT (self)));
+ closure->account = g_strdup (account);
+ closure->contact_id = g_strdup (contact_id);
+ /* XXX: ideally we'd up the ref count or duplicate this */
+diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
+index 49bc6db..8ae500d 100644
+--- a/telepathy-logger/log-manager.c
++++ b/telepathy-logger/log-manager.c
+@@ -160,7 +160,7 @@ log_manager_constructor (GType type,
+ GObject *retval = NULL;
+
+ if (G_LIKELY (manager_singleton))
+- retval = g_object_ref (manager_singleton);
++ retval = g_object_ref (G_OBJECT (manager_singleton));
+ else
+ {
+ retval = G_OBJECT_CLASS (tpl_log_manager_parent_class)->constructor (
+--
+cgit v1.2.3
+
diff -Nru
telepathy-logger-0.8.2/debian/patches/backport/5eaf8c99748b3d4e61afaba24ff6bf763f81695d.patch
telepathy-logger-
0.8.2/debian/patches/backport/5eaf8c99748b3d4e61afaba24ff6bf763f81695d.patch
---
telepathy-logger-0.8.2/debian/patches/backport/5eaf8c99748b3d4e61afaba24ff6bf763f81695d.patch
1969-12-31 19:00:00.000000000 -0500
+++
telepathy-logger-0.8.2/debian/patches/backport/5eaf8c99748b3d4e61afaba24ff6bf763f81695d.patch
2024-10-11 15:09:20.000000000 -0400
@@ -0,0 +1,33 @@
+From 5eaf8c99748b3d4e61afaba24ff6bf763f81695d Mon Sep 17 00:00:00 2001
+From: Daniel Landau <dan...@landau.fi>
+Date: Sun, 29 Jan 2017 19:37:07 +0200
+Subject: Preserve the original order of messages
+
+Applied-Upstream:
https://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=5eaf8c99748b3d4e61afaba24ff6bf763f81695d
+---
+ telepathy-logger/text-channel.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
+index 8712cd5..ddb8e8e 100644
+--- a/telepathy-logger/text-channel.c
++++ b/telepathy-logger/text-channel.c
+@@ -519,6 +519,15 @@ store_pending_messages (TplTextChannel *self)
+ {
+ GList *it;
+
++ /* The list in pending_messages was ordered by arrival
++ * (pending_message_id), then it was prepended to to_log one by one, so
++ * we need te reverse it to get back the original order.
++ */
++ to_log = g_list_reverse (to_log);
++ /* Sort by time stamp in case the messages arrive in a messed up order.
++ * g_list_sort is stable, so messages that arrive at the same time stamp
++ * (e.g. from a bouncer) will not lose their original order.
++ */
+ to_log = g_list_sort (to_log,
+ (GCompareFunc) pending_message_compare_timestamp);
+
+--
+cgit v1.2.3
+
diff -Nru telepathy-logger-0.8.2/debian/patches/series
telepathy-logger-0.8.2/debian/patches/series
--- telepathy-logger-0.8.2/debian/patches/series 2019-11-08
10:54:02.000000000 -0500
+++ telepathy-logger-0.8.2/debian/patches/series 2024-10-11
15:09:20.000000000 -0400
@@ -2,3 +2,5 @@
update_gtkdoc.patch
doc-Use-CDATA-section-to-avoid-XML-error-caused-by-e.patch
sync_tools_with_tp-glib_master.patch
+backport/2e50d1855b3395b622c768094ff2b617a0208724.patch
+backport/5eaf8c99748b3d4e61afaba24ff6bf763f81695d.patch
signature.asc
Description: This is a digitally signed message part
