From 8c774f47bef1db847be4d87108bd8aa2574125c2 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 7 Feb 2019 17:41:42 +0100 Subject: [PATCH 1/2] Added Bionic, updated lots of dependencies --- BuildFiles/Packaging/dependencies/backend-default | 2 +- BuildFiles/Packaging/dependencies/common-default | 2 +- BuildFiles/Packaging/scripts/repackage-build-package | 2 +- .../Packaging/templates/control-backend-internal.template | 2 +- BuildFiles/Packaging/templates/control-backend-sprint.template | 2 +- BuildFiles/Packaging/templates/control-common-internal.template | 2 +- BuildFiles/Packaging/templates/control-common-release.template | 1 + BuildFiles/Packaging/templates/control-common-sprint.template | 2 +- .../Packaging/templates/control-frontend-internal.template | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/BuildFiles/Packaging/dependencies/backend-default b/BuildFiles/Packaging/dependencies/backend-default index 25f6440f..37ece04a 100644 --- a/BuildFiles/Packaging/dependencies/backend-default +++ b/BuildFiles/Packaging/dependencies/backend-default @@ -1 +1 @@ -libmono-corlib4.5-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8),libmono-system-numerics4.0-cil,libmono-system-management4.0-cil,libmono-system-runtime4.0-cil,imagemagick,ghostscript,tesseract-ocr,inkscape,mono-devel +libmono-corlib4.5-cil (>= 3.2.8), libmono-posix4.0-cil (>= 3.2.8), libmono-system-data4.0-cil (>= 3.2.8), libmono-system-web-http4.0-cil (>= 3.2.8), libmono-system-numerics4.0-cil, libmono-system-management4.0-cil, libmono-system-runtime4.0-cil, imagemagick, ghostscript, tesseract-ocr, inkscape diff --git a/BuildFiles/Packaging/dependencies/common-default b/BuildFiles/Packaging/dependencies/common-default index f6a79aa3..cc2cc45a 100644 --- a/BuildFiles/Packaging/dependencies/common-default +++ b/BuildFiles/Packaging/dependencies/common-default @@ -1 +1 @@ -libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),libmono-system-web-services4.0-cil (>= 3.2.8),libmono-system-web-extensions4.0-cil (>= 3.2.8),libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),fonts-liberation,libmono-system-numerics4.0-cil +libmono-system-componentmodel-composition4.0-cil, libmono-system-web-services4.0-cil, libmono-system-web-extensions4.0-cil, libmono-system-componentmodel-composition4.0-cil, libmono-system-numerics4.0-cil, fonts-liberation diff --git a/BuildFiles/Packaging/scripts/repackage-build-package b/BuildFiles/Packaging/scripts/repackage-build-package index 7cea2fd7..d8ec11ce 100755 --- a/BuildFiles/Packaging/scripts/repackage-build-package +++ b/BuildFiles/Packaging/scripts/repackage-build-package @@ -5,7 +5,7 @@ # Home folder for script is /home/builder/swarmops/packaging DEPLOYDIR=usr/share/swarmops -DISTROS=xenial,stretch,jessie +DISTROS=xenial,bionic,stretch,jessie # Check parameters diff --git a/BuildFiles/Packaging/templates/control-backend-internal.template b/BuildFiles/Packaging/templates/control-backend-internal.template index 424665b6..f2ab3f17 100644 --- a/BuildFiles/Packaging/templates/control-backend-internal.template +++ b/BuildFiles/Packaging/templates/control-backend-internal.template @@ -2,7 +2,7 @@ Package: swarmops-backend-internal Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common-internal (>= --BuildNumber--), mono-runtime (>=3.2.8), --Dependencies-- +Depends: swarmops-common-internal(>=--BuildNumber--),--Dependencies-- Conflicts: swarmops-backend,swarmops-backend-stable Homepage: http://swarmops.com/ Description: Swarmops Backend (Internal) diff --git a/BuildFiles/Packaging/templates/control-backend-sprint.template b/BuildFiles/Packaging/templates/control-backend-sprint.template index 2942cec3..66bc22e7 100644 --- a/BuildFiles/Packaging/templates/control-backend-sprint.template +++ b/BuildFiles/Packaging/templates/control-backend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-backend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common (>= --BuildNumber--),mono-runtime (>= 3.2.8),--Dependencies-- +Depends: swarmops-common (>= --BuildNumber--),--Dependencies-- Conflicts: swarmops-backend-internal,swarmops-backend-stable Homepage: http://swarmops.com/ Description: Swarmops Backend diff --git a/BuildFiles/Packaging/templates/control-common-internal.template b/BuildFiles/Packaging/templates/control-common-internal.template index b2e50708..c98d6752 100644 --- a/BuildFiles/Packaging/templates/control-common-internal.template +++ b/BuildFiles/Packaging/templates/control-common-internal.template @@ -2,7 +2,7 @@ Package: swarmops-common-internal Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog (>= 1.1), --Dependencies-- +Depends: dialog (>=1.1), mono-runtime (>=3.2.8), --Dependencies-- Conflicts: swarmops-common,swarmops-common-stable Homepage: http://swarmops.com/ Description: Swarmops Common (Internal) diff --git a/BuildFiles/Packaging/templates/control-common-release.template b/BuildFiles/Packaging/templates/control-common-release.template index 03ee9a7c..f0fb85c5 100644 --- a/BuildFiles/Packaging/templates/control-common-release.template +++ b/BuildFiles/Packaging/templates/control-common-release.template @@ -2,6 +2,7 @@ Package: swarmops-common-stable Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) +Depends:dialog(>=1.1),mono-runtime,--Dependencies-- Conflicts: swarmops-common-internal,swarmops-common Homepage: http://swarmops.com/ Description: Swarmops Common (Stable) diff --git a/BuildFiles/Packaging/templates/control-common-sprint.template b/BuildFiles/Packaging/templates/control-common-sprint.template index 138721ae..4a56bcb8 100644 --- a/BuildFiles/Packaging/templates/control-common-sprint.template +++ b/BuildFiles/Packaging/templates/control-common-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-common Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog (>= 1.1), --Dependencies-- +Depends: dialog (>=1.1), mono-runtime (>=3.2.8), --Dependencies-- Conflicts: swarmops-common-internal,swarmops-common-stable Homepage: http://swarmops.com/ Description: Swarmops Common diff --git a/BuildFiles/Packaging/templates/control-frontend-internal.template b/BuildFiles/Packaging/templates/control-frontend-internal.template index e8c2a6a3..31dfd1ac 100644 --- a/BuildFiles/Packaging/templates/control-frontend-internal.template +++ b/BuildFiles/Packaging/templates/control-frontend-internal.template @@ -2,7 +2,7 @@ Package: swarmops-frontend-internal Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog(>= 1.1), swarmops-common-internal (>= --BuildNumber--), swarmops-frontend-external-scripts-internal (>= --BuildNumber--), --Dependencies-- +Depends: dialog(>= 1.1),swarmops-common-internal(>=--BuildNumber--),swarmops-frontend-external-scripts-internal(>=--BuildNumber--),--Dependencies-- Conflicts: swarmops-frontend,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend (Internal) From 6e18a1642b88166fb9de6120c0686196b094f1ca Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 7 Feb 2019 17:43:29 +0100 Subject: [PATCH 2/2] Added Bionic to build results, too --- BuildFiles/Building/xsl/header.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildFiles/Building/xsl/header.xsl b/BuildFiles/Building/xsl/header.xsl index 931f267f..c0d34707 100644 --- a/BuildFiles/Building/xsl/header.xsl +++ b/BuildFiles/Building/xsl/header.xsl @@ -35,7 +35,7 @@ Built for: - xenial stretch + xenial bionic jessie stretch Time of build: