packaging: move contrib/debian to contrib/packaging/

Differential Revision: https://phab.mercurial-scm.org/D3547

contrib/packaging/builddeb

@@ -73,7 +73,7 b' if [ "$BUILD" ]; then'
         exit 1
     fi
 
-    cp -r "$PWD"/contrib/debian debian
+    cp -r "$PWD"/contrib/packaging/debian debian
 
     sed -i.tmp "s/__VERSION__/$debver/" $changelog
     sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog

contrib/packaging/debian/rules

@@ -35,7 +35,7 b' override_dh_install:'
 	mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/mercurial
 	cp contrib/hgk "$(CURDIR)"/debian/mercurial-common/usr/share/mercurial
 	mkdir -p "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/
-	cp contrib/debian/*.rc "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/
+	cp contrib/packaging/debian/*.rc "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/
 	# completions
 	mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/bash-completion/completions
 	cp contrib/bash_completion "$(CURDIR)"/debian/mercurial-common/usr/share/bash-completion/completions/hg

tests/hghave.py

@@ -616,7 +616,7 b' def has_debhelper():'
        "debian build dependencies (run dpkg-checkbuilddeps in contrib/)")
 def has_debdeps():
     # just check exit status (ignoring output)
-    path = '%s/../contrib/debian/control' % os.environ['TESTDIR']
+    path = '%s/../contrib/packaging/debian/control' % os.environ['TESTDIR']
     return matchoutput('dpkg-checkbuilddeps %s' % path, br'')
 
 @check("demandimport", "demandimport enabled")