From 6a80cc60b6d5724ed25db6d15811836b166593ed Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Mon, 26 Nov 2018 22:14:51 -0500
Subject: [PATCH] Only package debian/tmp/[data]/file in asset source package;
extra instructions
---
assets/debian/README.Debian | 3 +++
assets/debian/rules | 13 +++++++++++--
debian/README.Debian | 3 +++
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/assets/debian/README.Debian b/assets/debian/README.Debian
index dcb0718ba..b0c13337d 100644
--- a/assets/debian/README.Debian
+++ b/assets/debian/README.Debian
@@ -23,6 +23,9 @@ Next, you will have to add that key fingerprint to your Launchpad account. Go to
profile and click the yellow Edit button next to "OpenPGP keys". Once you add the key, you can
upload signed source packages and publish them onto your PPA.
+IF YOU UPLOAD A PACKAGE and Launchpad does NOT send you a confirmation or rejection email, that
+means your key is not set up correctly with your Launchpad account.
+
Use these steps to prepare building a source package for Launchpad:
-2. Highly recommend copying the assets/ folder to outside your repo folder, or else the asset
diff --git a/assets/debian/rules b/assets/debian/rules
index 23f67c979..b2acc7111 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 ]; then \
+ if [ ! -f $(RESOURCEDIR)/$$file ] && [ ! -f $(RESOURCEDIR)/debian/tmp/$(DATADIR)/$$file ]; then \
$(WGET) http://alam.srb2.org/SRB2/2.1.21-Final/Resources/$$file; \
fi; \
if [ -f $(RESOURCEDIR)/$$file ]; then \
@@ -58,7 +58,16 @@ build:
else \
$(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/$$file; \
fi; \
- echo $(RESOURCEDIR)/$$file >> $(DIR)/debian/source/include-binaries; \
+ 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; \
+ else \
+ echo $(RESOURCEDIR)/debian/tmp/$(DATADIR)/$$file not found and could not be downloaded!; \
+ return 1; \
fi; \
done
diff --git a/debian/README.Debian b/debian/README.Debian
index cb21f832c..6ab440eb9 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -22,6 +22,9 @@ Next, you will have to add that key fingerprint to your Launchpad account. Go to
profile and click the yellow Edit button next to "OpenPGP keys". Once you add the key, you can
upload signed source packages and publish them onto your PPA.
+IF YOU UPLOAD A PACKAGE and Launchpad does NOT send you a confirmation or rejection email, that
+means your key is not set up correctly with your Launchpad account.
+
Use these steps to prepare building a source package for Launchpad:
-2. cd [srb2repo]
--
GitLab