[Pkg-sogo-maintainers] Bug#1115094: sbjson: please replace CDBS usage with dh_gnustep

[Yavor Doganov]

Control: tags -1 + patch

Please find attached a patch.
-------------- next part --------------
>From 616e8a7db00a284b67d3bd55db73e39117a3951e Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Thu, 18 Sep 2025 21:24:28 +0300
Subject: [PATCH] Get rid of CDBS (#1115094).

---
 debian/changelog |  9 +++++++++
 debian/compat    |  1 -
 debian/control   |  3 +--
 debian/rules     | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/changelog b/debian/changelog
index 65bae5c..82c9349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sbjson (2.3.2-6) UNRELEASED; urgency=medium
+
+  * debian/rules: Rewrite for dh.
+  * debian/control (Build-Depends): Remove cdbs (Closes: #1115094).
+    Switch to debhelper-compat; set level to 13.
+  * debian/compat: Delete.
+
+ -- Yavor Doganov <yavor at gnu.org>  Thu, 18 Sep 2025 21:21:51 +0300
+
 sbjson (2.3.2-5) unstable; urgency=medium
 
   [ Yavor Doganov ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 2c13188..03a9408 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian SOGo Maintainers <pkg-sogo-maintainers at lists.alioth.debian.or
 Uploaders: Jeroen Dekkers <jeroen at dekkers.ch>,
            Jordi Mallach <jordi at debian.org>
 Build-Depends: dpkg-dev (>= 1.22.5),
-               debhelper (>= 10),
-               cdbs,
+               debhelper-compat (= 13),
                libgnustep-base-dev (>= 1.30.0-10)
 Standards-Version: 4.7.0
 Homepage: https://github.com/SBJson/SBJson
diff --git a/debian/rules b/debian/rules
index 56fa351..2122d0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,14 @@
 export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-include /usr/share/dpkg/buildflags.mk
-# FIXME: dpkg-buildflags / cdbs should support OBJCFLAGS
-DEB_MAKE_BUILD_TARGET = all messages=yes OBJCFLAGS="$(CFLAGS)"
+include /usr/share/GNUstep/debian/config.mk
 
-include /usr/share/cdbs/1/rules/gnustep.mk
-include /usr/share/cdbs/1/class/gnumakefile.mk
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- $(optim) $(verbose) \
+	  $(shell dpkg-buildflags --export=cmdline)
+
+execute_before_dh_link:
+	gsdh_gnustep
-- 
2.51.0