This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=259debe76b8d3283c20ddaa476e6ee95270e593f

commit 259debe76b8d3283c20ddaa476e6ee95270e593f
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Wed Apr 3 12:10:35 2024 +0200

    build: Do not include VCS specific files in the distributed tarball
    
    These files only make sense when they are part of the VCS.
---
 Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 485c4e537..97f4c2bd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,8 +55,6 @@ dist_docspec_DATA = \
        # EOL
 
 EXTRA_DIST = \
-       .gitlab-ci.yml \
-       .mailmap \
        ChangeLog.old \
        README.l10n \
        autogen \
@@ -241,16 +239,21 @@ include $(top_srcdir)/build-aux/cpan.am
 # that we're not forgetting some files, and we are not storing any symlink
 # in the repository (except for the origins/default one) as those degrade
 # to regular files due to automake telling tar to dereference them.
+#
+# XXX: As long as we have the Makefile based functional test suite, we need
+# to remove .gitignore files from it, because we are including the entire
+# hierarchy in EXTRA_DIST.
 dist-hook:
        echo $(VERSION) >$(distdir)/.dist-version
        echo $(PACKAGE_VCS_URL) >$(distdir)/.dist-vcs-url
        echo $(PACKAGE_VCS_ID) >$(distdir)/.dist-vcs-id
+       find "$(distdir)/tests" -type f -name '.git*' | xargs rm -f
        if [ -e .git ]; then \
          for file in `git ls-tree -r HEAD | grep ^12 | grep -v 
t/origins/default`; do \
            echo "$$file is a symlink packed as a file on the dist tar" >&2 ; \
            exit 1 ; \
          done ; \
-         for file in `git ls-files | grep -vE '\.git(ignore|-blame)'`; do \
+         for file in `git ls-files | grep -vE '\.(git|mailmap)'`; do \
            if [ ! -e "$(distdir)/$$file" ]; then \
              echo "$$file is missing in $(distdir)" >&2 ; \
              exit 1 ; \

-- 
Dpkg.Org's dpkg

Reply via email to