[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/caja-extensions][master] 9 commits: NMU to experimental (debian/1.26.1-1.1)

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / caja-extensions

Commits:

  • 42ae8325
    by Mike Gabriel at 2024-03-25T13:31:06+01:00 
    NMU to experimental (debian/1.26.1-1.1)
  • 90085fa9
    by Mike Gabriel at 2024-03-25T13:33:04+01:00 
    NMU to unstable (debian/1.26.1-1.2)
  • a73d9576
    by Mike Gabriel at 2024-03-25T13:33:43+01:00 
    debian/patches: Drop caja-extensions-guphp-1.6.patch. Incomplete/broken.
  • 52c78c8d
    by Mike Gabriel at 2024-03-25T13:39:27+01:00 
    debian/patches: Add 1002_gupnp-1.6.patch. Cherry-picked from upstream. (Closes: #1066380).
  • b258ab77
    by Mike Gabriel at 2024-03-25T13:40:02+01:00 
    debian/patches: Trivially rebase 2001_support-icedove-in-caja-sendto.patch.
  • 5a59a84c
    by Mike Gabriel at 2024-03-25T13:40:33+01:00 
    debian/control: Bump Standards-Version: to 4.6.2. No changes needed.
  • 5b141b30
    by Mike Gabriel at 2024-03-25T13:44:03+01:00 
    debian/control: Switch from pkg-config to pkgconf. Thanks, lintian.
  • cefc78bc
    by Mike Gabriel at 2024-03-25T13:44:32+01:00 
    debian/copyright: Update copyright attribution for debian/.
  • 680be54e
    by Mike Gabriel at 2024-03-25T13:45:50+01:00 
    upload to unstable (debian/1.26.1-2)

6 changed files:

Changes:

  • debian/changelog
    1 
    +caja-extensions (1.26.1-2) unstable; urgency=medium
    2 
    +
    3 
    +  * debian/patches:
    4 
    +    + Drop caja-extensions-guphp-1.6.patch. Incomplete/broken.
    5 
    +    + Add 1002_gupnp-1.6.patch. Cherry-picked from upstream. (Closes: #1066380).
    6 
    +    + Trivially rebase 2001_support-icedove-in-caja-sendto.patch.
    7 
    +  * debian/control:
    8 
    +    + Bump Standards-Version: to 4.6.2. No changes needed.
    9 
    +    + Switch from pkg-config to pkgconf. Thanks, lintian.
    10 
    +  * debian/copyright:
    11 
    +    + Update copyright attribution for debian/.
    12 
    +
    13 
    + -- Mike Gabriel <sunweaver@debian.org>  Mon, 25 Mar 2024 13:39:03 +0100
    14 
    +
    15 
    +caja-extensions (1.26.1-1.2) unstable; urgency=medium
    16 
    +
    17 
    +  * Non-maintainer upload.
    18 
    +  * Upload to unstable.
    19 
    +
    20 
    + -- Andreas Henriksson <andreas@fatal.se>  Mon, 31 Oct 2022 10:26:44 +0100
    21 
    +
    22 
    +caja-extensions (1.26.1-1.1) experimental; urgency=medium
    23 
    +
    24 
    +  * Non-maintainer upload.
    25 
    +  * Add debian/patches/caja-extensions-gupnp-1.6.patch
    26 
    +  * Change gupnp build-dep to 1.6 (Closes: #1022007)
    27 
    +
    28 
    + -- Andreas Henriksson <andreas@fatal.se>  Fri, 28 Oct 2022 23:11:55 +0200
    29 
    +
    1 30 
     caja-extensions (1.26.1-1) unstable; urgency=medium
    2 31
    3 32 
       * New upstream release.

  • debian/control
    ... ... @@ -13,13 +13,13 @@ Build-Depends: debhelper-compat (= 13),
    13 13 
                    libdbus-glib-1-dev,
    14 14 
                    libdconf-dev,
    15 15 
                    libgtk-3-dev,
    16 
    -               libgupnp-1.2-dev,
    16 
    +               libgupnp-1.6-dev,
    17 17 
                    libmate-desktop-dev (>= 1.18),
    18 18 
                    libstartup-notification0-dev,
    19 19 
                    libxml2-utils,
    20 20 
                    mate-common (>= 1.18),
    21 
    -               pkg-config,
    22 
    -Standards-Version: 4.6.1
    21 
    +               pkgconf,
    22 
    +Standards-Version: 4.6.2
    23 23 
     Rules-Requires-Root: no
    24 24 
     Homepage: http://www.mate-desktop.org/
    25 25 
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/caja-extensions

  • debian/copyright
    ... ... @@ -148,7 +148,7 @@ License: public-domain
    148 148
    149 149 
     Files: debian/*
    150 150 
     Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
    151 
    -           2014, Mike Gabriel <sunweaver@debian.org>
    151 
    +           2014-2024, Mike Gabriel <sunweaver@debian.org>
    152 152 
     License: GPL-2+
    153 153
    154 154 
     License: GPL-2+

  • debian/patches/1002_gupnp-1.6.patch
    1 
    +From 652e145d2c5e2a9658eed7a665fe5a295503940b Mon Sep 17 00:00:00 2001
    2 
    +From: Xiaotian Wu <yetist@gmail.com>
    3 
    +Date: Mon, 16 Oct 2023 10:42:27 +0800
    4 
    +Subject: [PATCH] sendto: require gupnp-1.6
    5 
    +
    6 
    +---
    7 
    + configure.ac               |  6 ++---
    8 
    + sendto/plugins/upnp/upnp.c | 48 ++++++++++++++++++++++----------------
    9 
    + 2 files changed, 30 insertions(+), 24 deletions(-)
    10 
    +
    11 
    +--- a/configure.ac
    12 
    ++++ b/configure.ac
    13 
    +@@ -97,7 +97,7 @@
    14 
    +         GTHREAD_REQUIRED=2.6.0
    15 
    +         DBUS_REQUIRED=1.0
    16 
    +         DBUS_GLIB_REQUIRED=0.60
    17 
    +-        GUPNP_REQUIRED=0.13
    18 
    ++        GUPNP_REQUIRED=1.6
    19 
    +         PKG_CHECK_MODULES(SENDTO,
    20 
    +                 glib-2.0    >= $GLIB_REQUIRED
    21 
    +                 gthread-2.0 >= $GTHREAD_REQUIRED
    22 
    +@@ -211,9 +211,7 @@
    23 
    +             fi
    24 
    +             ;;
    25 
    +             upnp)
    26 
    +-                PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED,
    27 
    +-                    enable_upnp=yes AC_DEFINE([HAS_GUPNP_VERSION_1_2], 1, ["Version is at least 1.2"]), enable_upnp=no)
    28 
    +-                PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED,
    29 
    ++                PKG_CHECK_MODULES(UPNP, gupnp-1.6 >= $GUPNP_REQUIRED,
    30 
    +                     enable_upnp=yes, enable_upnp=no)
    31 
    +                 if test "${enable_upnp}" != "yes" ; then
    32 
    +                     sendto_plugin_error_or_ignore "you need gupnp installed to build the upnp plugin"
    33 
    +--- a/sendto/plugins/upnp/upnp.c
    34 
    ++++ b/sendto/plugins/upnp/upnp.c
    35 
    +@@ -87,25 +87,37 @@
    36 
    + }
    37 
    +
    38 
    + static void
    39 
    +-get_introspection_cb (GUPnPServiceInfo *service_info,
    40 
    +-		      GUPnPServiceIntrospection *introspection, const GError *error,
    41 
    +-		      gpointer user_data)
    42 
    ++get_introspection_cb (GObject *source_object,
    43 
    ++                      GAsyncResult *res,
    44 
    ++                      gpointer user_data)
    45 
    + {
    46 
    + 	GUPnPDeviceInfo *device_info;
    47 
    + 	gchar *name;
    48 
    + 	const gchar *udn, *interface;
    49 
    + 	GtkTreeIter iter;
    50 
    + 	GUPnPContext *context;
    51 
    ++    GError *error = NULL;
    52 
    +
    53 
    + 	device_info = GUPNP_DEVICE_INFO (user_data);
    54 
    +
    55 
    +-	if (introspection != NULL) {
    56 
    +-		/* If introspection is available, make sure required actions
    57 
    +-		 * are implemented.
    58 
    +-		 */
    59 
    +-		if (!check_required_actions (introspection))
    60 
    +-			goto error;
    61 
    +-	}
    62 
    ++    GUPnPServiceIntrospection *introspection =
    63 
    ++      gupnp_service_info_introspect_finish (GUPNP_SERVICE_INFO (GUPNP_SERVICE_INFO (source_object)),
    64 
    ++                                            res,
    65 
    ++                                            &error);
    66 
    ++    if (error) {
    67 
    ++        g_warning ("Failed to create introspection for '%s': %s",
    68 
    ++                   gupnp_service_info_get_udn (GUPNP_SERVICE_INFO (source_object)),
    69 
    ++                   error->message);
    70 
    ++        g_clear_error (&error);
    71 
    ++        goto error;
    72 
    ++    }
    73 
    ++
    74 
    ++    /* If introspection is available, make sure required actions
    75 
    ++     * are implemented.
    76 
    ++     */
    77 
    ++    if (!check_required_actions (introspection)) {
    78 
    ++        goto error;
    79 
    ++    }
    80 
    +
    81 
    + 	udn = gupnp_device_info_get_udn (device_info);
    82 
    + 	if (G_UNLIKELY (udn == NULL))
    83 
    +@@ -129,10 +141,8 @@
    84 
    + 					   -1);
    85 
    +
    86 
    + 	g_free (name);
    87 
    +-
    88 
    ++    g_object_unref (introspection);
    89 
    + error:
    90 
    +-	/* We don't need the proxy objects anymore */
    91 
    +-	g_object_unref (service_info);
    92 
    + 	g_object_ref (device_info);
    93 
    + }
    94 
    +
    95 
    +@@ -148,9 +158,10 @@
    96 
    + 		return;
    97 
    + 	}
    98 
    +
    99 
    +-	gupnp_service_info_get_introspection_async (info,
    100 
    +-						    get_introspection_cb,
    101 
    +-						    g_object_ref (proxy));
    102 
    ++	gupnp_service_info_introspect_async (info,
    103 
    ++                                         NULL,
    104 
    ++                                         get_introspection_cb,
    105 
    ++                                         g_object_ref (proxy));
    106 
    + }
    107 
    +
    108 
    + static void
    109 
    +@@ -211,11 +222,7 @@
    110 
    + 		return FALSE;
    111 
    + 	g_free (upload_cmd);
    112 
    +
    113 
    +-#ifdef HAS_GUPNP_VERSION_1_2
    114 
    + 	context_manager = gupnp_context_manager_create (0);
    115 
    +-#else
    116 
    +-	context_manager = gupnp_context_manager_new (NULL, 0);
    117 
    +-#endif
    118 
    + 	g_assert (context_manager != NULL);
    119 
    + 	g_signal_connect (context_manager, "context-available",
    120 
    + 			  G_CALLBACK (on_context_available), NULL);
    121 
    +@@ -275,6 +282,7 @@
    122 
    + 	g_ptr_array_add (argv, "15"); /* discovery timeout (seconds) */
    123 
    + 	g_ptr_array_add (argv, "-e");
    124 
    + 	g_ptr_array_add (argv, interface);
    125 
    ++	g_ptr_array_add (argv, "-u");
    126 
    + 	g_ptr_array_add (argv, udn);
    127 
    + 	for (l = file_list ; l; l=l->next) {
    128 
    + 		gchar *file_path;

  • debian/patches/2001_support-icedove-in-caja-sendto.patch
    ... ... @@ -3,7 +3,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 3
    4 4 
     --- a/sendto/plugins/emailclient/emailclient.c
    5 5 
     +++ b/sendto/plugins/emailclient/emailclient.c
    6 
    -@@ -95,7 +95,7 @@
    6 
    +@@ -101,7 +101,7 @@
    7 7 
      		/* Find what the default mailer is */
    8 8 
      		if (strstr (mail_cmd, "balsa"))
    9 9 
      			type = MAILER_BALSA;

  • debian/patches/series
    1 1 
     2001_support-icedove-in-caja-sendto.patch
    2 2 
     1001_pkg-config-macro-not-cross-compilation-safe.patch
    3 
    +1002_gupnp-1.6.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: