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

smcv pushed a commit to branch master
in repository openarena-data.

commit 65bfde67c311d156a6cc070a5cad9b82ea3965f1
Author: Simon McVittie <[email protected]>
Date:   Tue Jun 28 10:34:55 2016 +0100

    d/rules: chmod all files, even those not in the obvious directory
    
    mp-pak0.pk3 contains ../CREDITS and ../COPYING.
---
 debian/changelog |  2 ++
 debian/rules     | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a69a6dd..8b8688b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openarena-data (0.8.5split-8) UNRELEASED; urgency=medium
   [ Simon McVittie ]
   * d/rules: add a comment indicating why we cannot run
     dh_strip_nondeterminism
+  * d/rules: chmod all files, even those not in the obvious directory
+    (mp-pak0.pk3 contains ../CREDITS and ../COPYING)
 
  -- Simon McVittie <[email protected]>  Tue, 28 Jun 2016 09:58:34 +0100
 
diff --git a/debian/rules b/debian/rules
index e1a4926..16072e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ debian/%.pk3.filenames: debian/%.pk3.contents
 debian/%.pk3.qvms: debian/%.pk3.contents
        sed -n -e 's/#.*//; s/\.qvm$$//p;' < $< > $@
 
-build/%: debian/%.pk3.qvms debian/%.pk3.filenames
+build/%: debian/%.pk3.qvms debian/%.pk3.filenames debian/%.pk3.contents.raw
        set -e; while read crc filename; do \
                        test -f $*-$$crc.qvm || \
                        $(MAKE) -f debian/rules QVMPREFIX=$(*F) QVMCRC=$$crc \
@@ -44,8 +44,13 @@ build/%: debian/%.pk3.qvms debian/%.pk3.filenames
                        touch --date='$(build_date)' $*/$$filename.qvm; \
                done < debian/$*.pk3.qvms
        rm -f $*.pk3
-       find $* -type d -exec chmod 0755 {} \;
-       find $* -type f -exec chmod 0644 {} \;
+       ( set -e; cd $*; while read crc filename; do \
+               if test $$crc = directory; then \
+                       chmod 0755 "$$filename"; \
+               else \
+                       chmod 0644 "$$filename"; \
+               fi; \
+       done ) < debian/$*.pk3.contents.raw
        ( cd $* && zip -X -o -q -9 $(CURDIR)/$*.pk3 -@ ) < \
                debian/$*.pk3.filenames
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openarena-data.git

_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to