From 79da670bd1b4f91eebee5c96b19eaf1f33c94777 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 10 Feb 2022 11:17:23 -0800
Subject: Packaging+GitLab CI: Move debian to the packaging directory.

We keep our various packaging assets in the "packaging" directory. Move
the Debian assets there. dpkg-buildpackage doesn't seem appear to have a
"debian directory path" option, but symlinking worked in my test
container.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6688b47b26..fefa715a65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -221,6 +221,7 @@ Debian Stable APT Package:
   rules: !reference [.if-merged]
   image: registry.gitlab.com/wireshark/wireshark-containers/debian-stable-dev
   script:
+    - ln --symbolic --no-dereference --force packaging/debian
     - perl tools/make-version.pl --set-release
     # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
     # https://gitlab.com/gitlab-com/support-forum/issues/2790
@@ -303,6 +304,7 @@ Ubuntu APT Package:
   script:
     # build-ubuntu puts us in `build`.
     - cd ..
+    - ln --symbolic --no-dereference --force packaging/debian
     - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ MAKE=ninja dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
     - mkdir ubuntu-packages
     - mv ../*.deb ubuntu-packages/
-- 
cgit v1.2.3