From f6bde1844e526c6b2bcdefe360776038280e42a4 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Mon, 26 Nov 2018 22:39:22 -0500 Subject: [PATCH] Keep the assets/ files; ignore the assets/debian/tmp files in source packaging --- assets/debian/rules | 12 +++--------- assets/debian/source/options | 1 + 2 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 assets/debian/source/options diff --git a/assets/debian/rules b/assets/debian/rules index b2acc711..d3792dde 100755 --- a/assets/debian/rules +++ b/assets/debian/rules @@ -49,7 +49,7 @@ build: # This will need to be updated every time SRB2 official version is # Copy data files to their install locations, and add data files to include-binaries for file in $(DATAFILES); do \ - if [ ! -f $(RESOURCEDIR)/$$file ] && [ ! -f $(RESOURCEDIR)/debian/tmp/$(DATADIR)/$$file ]; then \ + if [ ! -f $(RESOURCEDIR)/$$file ]; then \ $(WGET) http://alam.srb2.org/SRB2/2.1.21-Final/Resources/$$file; \ fi; \ if [ -f $(RESOURCEDIR)/$$file ]; then \ @@ -58,15 +58,9 @@ build: else \ $(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/$$file; \ fi; \ - fi; \ - if [ -f $(RESOURCEDIR)/debian/tmp/$(DATADIR)/$$file ]; then \ - if test "$$file" = "srb2.wad"; then \ - echo $(RESOURCEDIR)/debian/tmp/$(DATADIR)/srb2.srb >> $(DIR)/debian/source/include-binaries; \ - else \ - echo $(RESOURCEDIR)/debian/tmp/$(DATADIR)/$$file >> $(DIR)/debian/source/include-binaries; \ - fi; \ + echo $(RESOURCEDIR)/$$file >> $(DIR)/debian/source/include-binaries; \ else \ - echo $(RESOURCEDIR)/debian/tmp/$(DATADIR)/$$file not found and could not be downloaded!; \ + echo $(DIR)/$$file not found and could not be downloaded!; \ return 1; \ fi; \ done diff --git a/assets/debian/source/options b/assets/debian/source/options new file mode 100644 index 00000000..8b331485 --- /dev/null +++ b/assets/debian/source/options @@ -0,0 +1 @@ +tar-ignore = "tmp/*"