From 0062fded191e86fab519c57f2bfca05303f95c94 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Mon, 26 Nov 2018 21:37:39 -0500 Subject: [PATCH] Fixed broken date strings in debian package files; skip asset download if that file already exists --- assets/debian/README.Debian | 32 ++++++++++++++++++++++++++++++++ assets/debian/changelog | 4 ++-- assets/debian/copyright | 2 +- assets/debian/rules | 17 +++++++++++------ debian/README.Debian | 29 +++++++++++++++++++++++++++++ debian/copyright | 2 +- 6 files changed, 76 insertions(+), 10 deletions(-) diff --git a/assets/debian/README.Debian b/assets/debian/README.Debian index aed621c58..dcb0718ba 100644 --- a/assets/debian/README.Debian +++ b/assets/debian/README.Debian @@ -10,3 +10,35 @@ command to debuild. Make sure you export the key footprint and give them to your with apt-key add. Thanks! -- Callum Dickinson Fri, 26 Nov 2010 18:25:31 +1300 + + +Building for Launchpad PPA + +First, follow the above instructions to generate a GnuPG key with your identity. You will need +to publish the fingerprint of that key to Ubuntu's key server. + + https://help.ubuntu.com/community/GnuPrivacyGuardHowto#Uploading_the_key_to_Ubuntu_keyserver + +Next, you will have to add that key fingerprint to your Launchpad account. Go to your Launchpad +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. + +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 + files may be included in the main source package, when you build that. + -1. cd [wherever-your-assets-folder-is]/assets/ + 0. debuild -T clean (optional, if you already have asset files) + +Building the source package is a two-step process: + + 1. debuild -T build (this downloads the asset files from srb2.org) + 2. debuild -S -nc + * Builds the source package for Launchpad, including the asset files + * -nc keeps dpkg from cleaning the assets/ folder, which would remove the files that must + be packaged. + +Then follow the instructions at to upload +to your PPA and have Launchpad build your binary deb packages. + + -- Marco Zafra Mon, 26 Nov 2018 21:13:00 -0500 diff --git a/assets/debian/changelog b/assets/debian/changelog index fc306e756..f3a92e1cd 100644 --- a/assets/debian/changelog +++ b/assets/debian/changelog @@ -1,8 +1,8 @@ -srb2-data (2.1.21~1) unstable; urgency=high +srb2-data (2.1.21~7) trusty; urgency=high * Updated for SRB2 v2.1.21 - -- Marco Zafra on Mon, 26 Nov 2018 14:31:00 -0500 + -- Marco Zafra Mon, 26 Nov 2018 14:31:00 -0500 srb2-data (2.1.14~1) unstable; urgency=low diff --git a/assets/debian/copyright b/assets/debian/copyright index 85026223f..97d606b0f 100644 --- a/assets/debian/copyright +++ b/assets/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Marco Zafra on Mon, 26 Nov 2018 14:31:00 -0500 + Marco Zafra Mon, 26 Nov 2018 14:31:00 -0500 It was downloaded from: diff --git a/assets/debian/rules b/assets/debian/rules index d8681a86a..23f67c979 100755 --- a/assets/debian/rules +++ b/assets/debian/rules @@ -45,16 +45,21 @@ WGET := wget -P $(RESOURCEDIR) -c -nc build: $(MKDIR) $(DIR)/debian/tmp/$(DATADIR) + > $(DIR)/debian/source/include-binaries # 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 \ - $(WGET) http://alam.srb2.org/SRB2/2.1.21-Final/Resources/$$file; \ - if test "$$file" = "srb2.wad"; then \ - $(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/srb2.srb; \ - else \ - $(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/$$file; \ + if [ ! -f $(RESOURCEDIR)/$$file ]; then \ + $(WGET) http://alam.srb2.org/SRB2/2.1.21-Final/Resources/$$file; \ + fi; \ + if [ -f $(RESOURCEDIR)/$$file ]; then \ + if test "$$file" = "srb2.wad"; then \ + $(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/srb2.srb; \ + else \ + $(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/$$file; \ + fi; \ + echo $(RESOURCEDIR)/$$file >> $(DIR)/debian/source/include-binaries; \ fi; \ - echo $(RESOURCEDIR)/$$file >> $(DIR)/debian/source/include-binaries; \ done binary-indep: diff --git a/debian/README.Debian b/debian/README.Debian index bbc306b16..cb21f832c 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -9,3 +9,32 @@ instructions and pass the -k command to debuild. Make sure you export the and give them to your users to install with apt-key add. Thanks! -- Callum Dickinson Fri, 26 Nov 2010 18:25:31 +1300 + + +Building for Launchpad PPA + +First, follow the above instructions to generate a GnuPG key with your identity. You will need +to publish the fingerprint of that key to Ubuntu's key server. + + https://help.ubuntu.com/community/GnuPrivacyGuardHowto#Uploading_the_key_to_Ubuntu_keyserver + +Next, you will have to add that key fingerprint to your Launchpad account. Go to your Launchpad +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. + +Use these steps to prepare building a source package for Launchpad: + + -2. cd [srb2repo] + -1. git reset --hard; git clean -fd; git clean -fx; + * Resets your repo folder to a committed state and removes untracked files + * If you built srb2-data in the assets/ folder, MAKE SURE THAT FOLDER DOES NOT HAVE ASSETS, + OR THEY WILL BE INCLUDED IN THE MAIN SOURCE PACKAGE! (for some reason) + +Building the source package takes just one step: + + 1. debuild -S (builds the source package for Launchpad) + +Then follow the instructions at to upload +to your PPA and have Launchpad build your binary deb packages. + + -- Marco Zafra Mon, 26 Nov 2018 21:13:00 -0500 diff --git a/debian/copyright b/debian/copyright index 85026223f..97d606b0f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Marco Zafra on Mon, 26 Nov 2018 14:31:00 -0500 + Marco Zafra Mon, 26 Nov 2018 14:31:00 -0500 It was downloaded from: