From 26cb52214001bc89aa06d419764ed4a1e13d5a34 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 25 Nov 2025 21:43:31 +0800
Subject: [PATCH] Debian packaging: move to contrib/debian directory

This is the location requested by Debian's Upstream Guide, and means it
can be included in tarballs, simplifying the build process.
---
 .gitattributes                               | 2 --
 {debian => contrib/debian}/compat            | 0
 {debian => contrib/debian}/control           | 0
 {debian => contrib/debian}/copyright         | 0
 {debian => contrib/debian}/doc-base          | 0
 {debian => contrib/debian}/docs              | 0
 {debian => contrib/debian}/lintian-overrides | 0
 {debian => contrib/debian}/postinst          | 0
 {debian => contrib/debian}/prerm             | 0
 {debian => contrib/debian}/rules             | 0
 {debian => contrib/debian}/source/format     | 0
 11 files changed, 2 deletions(-)
 rename {debian => contrib/debian}/compat (100%)
 rename {debian => contrib/debian}/control (100%)
 rename {debian => contrib/debian}/copyright (100%)
 rename {debian => contrib/debian}/doc-base (100%)
 rename {debian => contrib/debian}/docs (100%)
 rename {debian => contrib/debian}/lintian-overrides (100%)
 rename {debian => contrib/debian}/postinst (100%)
 rename {debian => contrib/debian}/prerm (100%)
 rename {debian => contrib/debian}/rules (100%)
 rename {debian => contrib/debian}/source/format (100%)

diff --git a/.gitattributes b/.gitattributes
index 783bc8543..54b0ed57a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,8 +14,6 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 /build_tools/make_tarball.sh export-ignore
-/debian export-ignore
-/debian/* export-ignore
 /.github export-ignore
 /.github/* export-ignore
 /.builds export-ignore
diff --git a/debian/compat b/contrib/debian/compat
similarity index 100%
rename from debian/compat
rename to contrib/debian/compat
diff --git a/debian/control b/contrib/debian/control
similarity index 100%
rename from debian/control
rename to contrib/debian/control
diff --git a/debian/copyright b/contrib/debian/copyright
similarity index 100%
rename from debian/copyright
rename to contrib/debian/copyright
diff --git a/debian/doc-base b/contrib/debian/doc-base
similarity index 100%
rename from debian/doc-base
rename to contrib/debian/doc-base
diff --git a/debian/docs b/contrib/debian/docs
similarity index 100%
rename from debian/docs
rename to contrib/debian/docs
diff --git a/debian/lintian-overrides b/contrib/debian/lintian-overrides
similarity index 100%
rename from debian/lintian-overrides
rename to contrib/debian/lintian-overrides
diff --git a/debian/postinst b/contrib/debian/postinst
similarity index 100%
rename from debian/postinst
rename to contrib/debian/postinst
diff --git a/debian/prerm b/contrib/debian/prerm
similarity index 100%
rename from debian/prerm
rename to contrib/debian/prerm
diff --git a/debian/rules b/contrib/debian/rules
similarity index 100%
rename from debian/rules
rename to contrib/debian/rules
diff --git a/debian/source/format b/contrib/debian/source/format
similarity index 100%
rename from debian/source/format
rename to contrib/debian/source/format