Re: Please test sysconfig

Hi Pranav,

for whatever reason I was not able to `git am` your patch cleanly.
(possibly its better to use an attachment - hope mine will work
for you now).

I kept some of the install-sysconfig-hardware magic inside some
override_dh_auto_install target just due to some gut feeling that
this might follow the old d/rules logic better.  Please try this
and by any means feel free to drop this again if your

   debdiff old_package_in_sid.deb your_new_build.deb

looks good.  This should be the most important point.

Hope this helps and thank you for your work
   Andreas.


Am Wed, Mar 25, 2026 at 11:23:07AM +0000 schrieb Pranav P:
> Hi Andreas,
> 
> Can you please review the following patch?
> 
> From 93c0b0e3c2eb6b5ca3b60bd37d6f5fb818016b92 Mon Sep 17 00:00:00 2001
> From: Pranav P <[email protected]>
> Date: Wed, 25 Mar 2026 16:47:19 +0530
> Subject: [PATCH 1/1] convert d/rules to short dh
> 
> ---
>  debian/changelog                   |  3 +-
>  debian/rules                       | 58 ++----------------------------
>  debian/sysconfig-hardware.dirs     |  1 +
>  debian/sysconfig-hardware.install  |  8 +++++
>  debian/sysconfig-hardware.manpages |  1 +
>  5 files changed, 14 insertions(+), 57 deletions(-)
>  create mode 100644 debian/sysconfig-hardware.dirs
>  create mode 100644 debian/sysconfig-hardware.install
>  create mode 100644 debian/sysconfig-hardware.manpages
> 
> diff --git a/debian/changelog b/debian/changelog
> index 981a2bd..7c8f4ca 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -8,8 +8,7 @@ sysconfig (0.0.16) UNRELEASED; urgency=medium
>    * Standards-Version: 4.7.3 (Removed Priority field)
> 
>    [ Pranav P ]
> -  * d/rules: Replace deprecated dh_clean -k with dh_prep
> -  * d/rules: Use -a instead of deprecated -s flag for debhelper commands
> +  * Convert d/rules to short dh
> 
>   -- Andreas Tille <[email protected]>  Tue, 24 Mar 2026 11:19:58 +0100
> 
> diff --git a/debian/rules b/debian/rules
> index c31f2cd..d502443 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -3,59 +3,7 @@
>  # Uncomment this to turn on verbose mode.
>  #export DH_VERBOSE=1
> 
> -DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
> +%:
> +       dh $@
> 
> -build:
> -build-arch:
> -build-indep:
> -
> -clean:
> -       dh_testdir
> -       dh_clean
> -
> -install:
> -       dh_testdir
> -       dh_testroot
> -       dh_prep
> -       dh_installdirs
> -
> -       $(MAKE) -f debian/rules install-sysconfig-hardware-arch-$(DEB_HOST_ARCH)
> -
> -install-sysconfig-hardware-%: export DH_OPTIONS = -psysconfig-hardware
> -
> -install-sysconfig-hardware-arch-s390 install-sysconfig-hardware-arch-s390x: install-sysconfig-hardware-common
> -       dh_install etc/sysconfig/scripts/hardware/*-ccw* etc/sysconfig/scripts/hardware
> -       dh_install usr/share/initramfs-tools
> -
> -install-sysconfig-hardware-arch-%:
> -
> -install-sysconfig-hardware-common:
> -       dh_installdirs etc/sysconfig/hardware
> -       dh_install etc/sysconfig/scripts/common
> -       dh_install etc/sysconfig/scripts/hardware/functions
> -       dh_install etc/sysconfig/scripts/hardware/hw* etc/sysconfig/scripts/hardware
> -       dh_install etc/sysconfig/scripts/hardware/udev* etc/sysconfig/scripts/hardware
> -       dh_install lib usr
> -       dh_installman man/hw*.8
> -       dh_install sbin/hw* usr/sbin
> -
> -binary-indep: install
> -
> -binary-arch: install
> -       dh_testdir
> -       dh_testroot
> -       dh_installchangelogs -a
> -       dh_installdocs -a
> -       dh_installexamples -a
> -       dh_installman -a
> -       dh_link -a
> -       dh_strip -a
> -       dh_compress -a
> -       dh_fixperms -a
> -       dh_installdeb -a
> -       dh_gencontrol -a
> -       dh_md5sums -a
> -       dh_builddeb -a
> -
> -binary: binary-arch binary-indep
> -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
> +override_dh_auto_configure override_dh_auto_build override_dh_auto_test:
> diff --git a/debian/sysconfig-hardware.dirs b/debian/sysconfig-hardware.dirs
> new file mode 100644
> index 0000000..b0ec1fc
> --- /dev/null
> +++ b/debian/sysconfig-hardware.dirs
> @@ -0,0 +1 @@
> +etc/sysconfig/hardware
> diff --git a/debian/sysconfig-hardware.install b/debian/sysconfig-hardware.install
> new file mode 100644
> index 0000000..6ea7dc3
> --- /dev/null
> +++ b/debian/sysconfig-hardware.install
> @@ -0,0 +1,8 @@
> +etc/sysconfig/scripts/common
> +etc/sysconfig/scripts/hardware/functions
> +etc/sysconfig/scripts/hardware/hw* etc/sysconfig/scripts/hardware
> +etc/sysconfig/scripts/hardware/udev* etc/sysconfig/scripts/hardware
> +etc/sysconfig/scripts/hardware/*-ccw* etc/sysconfig/scripts/hardware
> +lib usr
> +sbin/hw* usr/sbin
> +usr/share/initramfs-tools
> diff --git a/debian/sysconfig-hardware.manpages b/debian/sysconfig-hardware.manpages
> new file mode 100644
> index 0000000..c6171d9
> --- /dev/null
> +++ b/debian/sysconfig-hardware.manpages
> @@ -0,0 +1 @@
> +man/hw*.8
> --
> 2.51.0
> 
> 
> I have had a successful sbuild with the above patch. But not sure whether this is correct.
> 
> Thanks,
> Pranav

-- 
https://fam-tille.de

>From 30efffb0b5db50f82a3a634ffef11242a1047816 Mon Sep 17 00:00:00 2001
From: Pranav P <[email protected]>
Date: Wed, 25 Mar 2026 16:47:19 +0530
Subject: [PATCH] convert d/rules to short dh

---
 debian/changelog                   |  3 +-
 debian/rules                       | 47 +++---------------------------
 debian/sysconfig-hardware.dirs     |  1 +
 debian/sysconfig-hardware.install  |  8 +++++
 debian/sysconfig-hardware.manpages |  1 +
 5 files changed, 15 insertions(+), 45 deletions(-)
 create mode 100644 debian/sysconfig-hardware.dirs
 create mode 100644 debian/sysconfig-hardware.install
 create mode 100644 debian/sysconfig-hardware.manpages

diff --git a/debian/changelog b/debian/changelog
index 981a2bd..7c8f4ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,7 @@ sysconfig (0.0.16) UNRELEASED; urgency=medium
   * Standards-Version: 4.7.3 (Removed Priority field)
 
   [ Pranav P ]
-  * d/rules: Replace deprecated dh_clean -k with dh_prep
-  * d/rules: Use -a instead of deprecated -s flag for debhelper commands
+  * Convert d/rules to short dh
 
  -- Andreas Tille <[email protected]>  Tue, 24 Mar 2026 11:19:58 +0100
 
diff --git a/debian/rules b/debian/rules
index c31f2cd..4fb66b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,20 +5,10 @@
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-build:
-build-arch:
-build-indep:
-
-clean:
-	dh_testdir
-	dh_clean 
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+%:
+	dh $@
 
+override_dh_auto_install:
 	$(MAKE) -f debian/rules install-sysconfig-hardware-arch-$(DEB_HOST_ARCH)
 
 install-sysconfig-hardware-%: export DH_OPTIONS = -psysconfig-hardware
@@ -29,33 +19,4 @@ install-sysconfig-hardware-arch-s390 install-sysconfig-hardware-arch-s390x: inst
 
 install-sysconfig-hardware-arch-%:
 
-install-sysconfig-hardware-common:
-	dh_installdirs etc/sysconfig/hardware
-	dh_install etc/sysconfig/scripts/common
-	dh_install etc/sysconfig/scripts/hardware/functions
-	dh_install etc/sysconfig/scripts/hardware/hw* etc/sysconfig/scripts/hardware
-	dh_install etc/sysconfig/scripts/hardware/udev* etc/sysconfig/scripts/hardware
-	dh_install lib usr
-	dh_installman man/hw*.8
-	dh_install sbin/hw* usr/sbin
-
-binary-indep: install
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch binary-indep
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
+override_dh_auto_configure override_dh_auto_build override_dh_auto_test:
diff --git a/debian/sysconfig-hardware.dirs b/debian/sysconfig-hardware.dirs
new file mode 100644
index 0000000..b0ec1fc
--- /dev/null
+++ b/debian/sysconfig-hardware.dirs
@@ -0,0 +1 @@
+etc/sysconfig/hardware
diff --git a/debian/sysconfig-hardware.install b/debian/sysconfig-hardware.install
new file mode 100644
index 0000000..6ea7dc3
--- /dev/null
+++ b/debian/sysconfig-hardware.install
@@ -0,0 +1,8 @@
+etc/sysconfig/scripts/common
+etc/sysconfig/scripts/hardware/functions
+etc/sysconfig/scripts/hardware/hw* etc/sysconfig/scripts/hardware
+etc/sysconfig/scripts/hardware/udev* etc/sysconfig/scripts/hardware
+etc/sysconfig/scripts/hardware/*-ccw* etc/sysconfig/scripts/hardware
+lib usr
+sbin/hw* usr/sbin
+usr/share/initramfs-tools
diff --git a/debian/sysconfig-hardware.manpages b/debian/sysconfig-hardware.manpages
new file mode 100644
index 0000000..c6171d9
--- /dev/null
+++ b/debian/sysconfig-hardware.manpages
@@ -0,0 +1 @@
+man/hw*.8