From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Sat, 4 Jun 2022 11:50:38 +0000 (+0200)
Subject: Merge pull request #290 from mikelward/makedeb
X-Git-Tag: 1.13~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eba8f3471566302298f4c366257f25470b0bf9fa;hp=8937d3e844ea21e2cc2c81f11da0a5ea57164bc4;p=deb_pkgs%2Fautorandr.git

Merge pull request #290 from mikelward/makedeb

Fix 'make deb' build target to build a .deb package
---

diff --git a/contrib/packaging/debian/debian/control b/contrib/packaging/debian/debian/control
index 7fb2be8..f5d6b51 100644
--- a/contrib/packaging/debian/debian/control
+++ b/contrib/packaging/debian/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>=9)
 Standards-Version: 3.9.6
 Homepage: https://github.com/phillipberndt/autorandr
 Architecture: all
-Depends: x11-xserver-utils, python
+Depends: x11-xserver-utils, python3
 Description: Automatically select a display configuration for connected devices
  Autorandr is a script for managing xrandr configurations based on the
  connected devices. It can be set up to automatically switch to a stored
diff --git a/contrib/packaging/debian/make_deb.sh b/contrib/packaging/debian/make_deb.sh
index fe8fe37..32d1b7b 100755
--- a/contrib/packaging/debian/make_deb.sh
+++ b/contrib/packaging/debian/make_deb.sh
@@ -45,7 +45,7 @@ SIZE=$(du -s $D | awk '{print $1}')
 
 cp -r "$P/debian" "$D/DEBIAN"
 chmod 0755 "$D/DEBIAN"
-[ -d "$D/etc" ] && (cd $D; find etc -type f) > "$D/DEBIAN/conffiles"
+[ -d "$D/etc" ] && (cd $D; find etc -type f -printf '/%p\n') > "$D/DEBIAN/conffiles"
 sed -i -re "s#Version:.+#Version: $V#" "$D/DEBIAN/control"
 echo "Installed-Size: $SIZE" >> "$D/DEBIAN/control"
 fakeroot dpkg-deb -b "$D" "$O"