Merge remote-tracking branch 'upstream/master'

.gitlab-ci.yml

@@ -84,13 +84,14 @@ win-packaging:
       rm -Rf Desktop PocketPC Source
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
     - test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-    # Making our Windows, MacOS and distro agnostic Linux packages
+    # Making our Windows packages
     - |
       echo -e "\e[0Ksection_start:`date +%s`:native_build\r\e[0KBuilding native packages"
       npm install --prefer-offline
       npm run dist-win
       for dir in dist/*-win-* ; do
           if [ -d $dir ] ; then
+              rm $dir/locales/*.info
               mkdir $dir/package.nw
               for file in package.nw/* ; do
                 mv $dir/`basename $file` $dir/package.nw
@@ -144,7 +145,7 @@ intel-packaging:
       apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" build-dep .
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
     - test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-    # Making our Windows, MacOS and distro agnostic Linux packages
+    # Making our MacOS and distro agnostic Linux packages
     - |
       echo -e "\e[0Ksection_start:`date +%s`:native_build\r\e[0KBuilding native packages"
       npm install --prefer-offline
@@ -153,6 +154,7 @@ intel-packaging:
       for dir in dist/*-linux-* ; do
         if [ -d $dir ] ; then
           cp package.nw/img/gridtracker.png $dir/
+          rm $dir/locales/*.info
           tar -C dist -czf ${dir}.tar.gz `basename $dir`
         fi
       done
@@ -216,6 +218,7 @@ arm-packaging:
       wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/nw49_2020-10-26/nw49_2020-10-26.tar.gz
       tar -xf nw49_2020-10-26.tar.gz
       tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-v0.49.2-linux-arm.tar.gz
+      rm nwjs-v0.49.2-linux-arm/locales/*.info
       mv nwjs-v0.49.2-linux-arm/nw nwjs-v0.49.2-linux-arm/GridTracker
       ls
       version=`node ./version.js`
@@ -316,7 +319,9 @@ source_release:
     ref: '$CI_COMMIT_SHA'
     assets:
       links:
-        - name: Binary images for $CI_COMMIT_TAG
+        - name: Release Packages for $CI_COMMIT_TAG
           url: https://fleetwood.mchambersradio.com/gridtracker/$CI_COMMIT_TAG/
+          external: true
+          link_type: package
   script:
     - echo 'Release for $CI_COMMIT_TAG'

debian/changelog

@@ -1,3 +1,8 @@
+gridtracker (1.21.0327) unstable; urgency=medium
+  This is the public release of the 1.21.0324 hotfix release candidates
+
+-- Matthew Chambers <nr0q@gridtracker.org> Fri, 27 Mar 2021 00:38:00 -0000
+
 gridtracker (1.21.0324) unstable; urgency=medium
   [Christian Bayer]
   * Fixed #72 CR not filtering correctly
@@ -8,7 +13,6 @@ gridtracker (1.21.0324) unstable; urgency=medium
 
  -- Christian Bayer <chrbayer84@googlemail.com>  Wed, 22 Mar 2021 22:00:00 -0500
 
-
 gridtracker (1.21.0322) unstable; urgency=medium
   [Christian Bayer]
   * Fixed windows packaging 

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.21.0324",
+  "version": "1.21.0327",
   "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "Stephen Loomis (N0TTL) and GridTracker.org",