From 9e23c23285381663e76d01090104b8654e1e6196 Mon Sep 17 00:00:00 2001
From: Max Erenberg <merenber@csclub.uwaterloo.ca>
Date: Sun, 6 Jun 2021 20:17:54 -0400
Subject: [PATCH] update Debian files for new Greenlight version

---
 .gitignore       |  3 +++
 Makefile         | 10 ++++++----
 bin/start        |  2 +-
 debian/changelog |  6 ++++++
 debian/control   | 10 +++++-----
 make_tarball.sh  |  2 +-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4486a6a..31c1f290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 # Ignore bundler config.
 /.bundle
 
+# Ignore .gem directory
+/.gem
+
 # Ignore Debian auto-generated files.
 /debian/debhelper-build-stamp
 /debian/files
diff --git a/Makefile b/Makefile
index 77820669..a43fed89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,16 @@
 prefix = /opt/greenlight
 
-BUNDLE = $(HOME)/.gem/ruby/2.5.0/bin/bundle
+RUBY_VERSION = 2.7.0
+BUNDLE = $(prefix)/.gem/ruby/$(RUBY_VERSION)/bin/bundle
 
+all:	export HOME = $(prefix)
 all:
 	[ -x $(BUNDLE) ] || gem install --user-install bundler
 	$(BUNDLE) config --global frozen 1
 	$(BUNDLE) install --deployment --without development:test:assets -j4 --path=vendor/bundle
-	rm -rf vendor/bundle/ruby/2.5.0/cache/*.gem
-	find vendor/bundle/ruby/2.5.0/gems/ -name "*.c" -delete
-	find vendor/bundle/ruby/2.5.0/gems/ -name "*.o" -delete
+	rm -rf vendor/bundle/ruby/$(RUBY_VERSION)/cache/*.gem
+	find vendor/bundle/ruby/$(RUBY_VERSION)/gems/ -name "*.c" -delete
+	find vendor/bundle/ruby/$(RUBY_VERSION)/gems/ -name "*.o" -delete
 
 install:
 	cp -r app bin .bundle config config.ru db Gemfile Gemfile.lock greenlight.nginx \
diff --git a/bin/start b/bin/start
index 8e4b4c2c..959581ee 100755
--- a/bin/start
+++ b/bin/start
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUBYBIN=$HOME/.gem/ruby/2.5.0/bin
+RUBYBIN=$HOME/.gem/ruby/2.7.0/bin
 NODEBIN=$PWD/node_modules/.bin
 export PATH=$RUBYBIN:$NODEBIN:$PATH
 export RAILS_ENV=production
diff --git a/debian/changelog b/debian/changelog
index 84a81284..5c87dfea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+greenlight (2.8.4-1) xenial; urgency=medium
+
+  * Upgrade to release 2.8.4.
+
+ -- Max Erenberg <merenber@csclub.uwaterloo.ca>  Wed, 12 May 2021 20:22:30 +0000
+
 greenlight (2.7.19-1) xenial; urgency=medium
 
   * Initial release.
diff --git a/debian/control b/debian/control
index e1b17f6b..16e3b32c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends:
   debhelper (>= 9),
   build-essential (>= 12.1),
   libcurl4-gnutls-dev,
-  ruby2.5,
-  ruby2.5-dev,
+  ruby2.7,
+  ruby2.7-dev,
   libpq-dev (>= 9.5),
   libsqlite3-dev,
   libyaml-dev (>= 0.1.6),
@@ -21,15 +21,15 @@ Depends:
   ${shlibs:Depends},
   ${misc:Depends},
   libcurl3-gnutls,
-  ruby2.5,
+  ruby2.7,
   libpq5,
   libsqlite3-0,
   libyaml-0-2,
   zlib1g (>= 1:1.2),
   zlib1g (<< 1:1.3),
   tzdata,
-  nodejs (>= 8),
-  nodejs (<< 9),
+  nodejs (>= 14),
+  nodejs (<< 15),
   npm
 Description: simple end-user interface for BigBlueButton
   Greenlight is a simple front-end interface for your BigBlueButton server.
diff --git a/make_tarball.sh b/make_tarball.sh
index 956ecce9..7d9ef16e 100755
--- a/make_tarball.sh
+++ b/make_tarball.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VER=2.7.19
+VER=2.8.4
 
 make clean
 cd ..