From 9d07b5ee53b5b5e2f3d4ccb935f5d72083412048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Sun, 10 Nov 2024 07:07:55 +0000
Subject: [PATCH] network-manager: standardize dpkg-vendor '--derives' instead
 of '--is'

---
 helpers/DATA/network-manager/define_trisquel_for_i386.patch | 2 +-
 helpers/make-network-manager                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/DATA/network-manager/define_trisquel_for_i386.patch b/helpers/DATA/network-manager/define_trisquel_for_i386.patch
index 874e20a..4a0e5e9 100644
--- a/helpers/DATA/network-manager/define_trisquel_for_i386.patch
+++ b/helpers/DATA/network-manager/define_trisquel_for_i386.patch
@@ -7,7 +7,7 @@ index 0740cdee..cde335f9 100755
  include /usr/share/dpkg/architecture.mk
  
 -ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
-+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes || dpkg-vendor --is Trisquel && echo yes) $(DEB_HOST_ARCH), yes i386)
++ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
     BUILD_PACKAGES += -Nnetwork-manager
     NETPLAN += --disable-netplan
  endif
diff --git a/helpers/make-network-manager b/helpers/make-network-manager
index 8b1761d..1ac66e9 100644
--- a/helpers/make-network-manager
+++ b/helpers/make-network-manager
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 COMPONENT=main
 
 . ./config