From f7cb81a1b4bfe07ea170f81eaea01124dc10e6c1 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 18 Feb 2019 06:47:21 +0100 Subject: [PATCH] Added comments, removed 'stable' control for now --- .../Packaging/dependencies/backend-default | 37 ++++++++++++++++++ .../Packaging/dependencies/common-default | 27 +++++++++++++ .../Packaging/dependencies/frontend-default | 38 +++++++++++++++++++ .../control-backend-release.template | 11 ------ .../templates/control-backend-sprint.template | 32 +++++++++++++++- .../templates/control-backend-stable.template | 11 ------ .../templates/control-common-release.template | 11 ------ .../templates/control-common-sprint.template | 34 ++++++++++++----- .../templates/control-common-stable.template | 10 ----- .../control-frontend-release.template | 11 ------ .../control-frontend-sprint.template | 27 +++++++++++++ .../control-frontend-stable.template | 11 ------ 12 files changed, 184 insertions(+), 76 deletions(-) delete mode 100644 BuildFiles/Packaging/templates/control-backend-release.template delete mode 100644 BuildFiles/Packaging/templates/control-backend-stable.template delete mode 100644 BuildFiles/Packaging/templates/control-common-release.template delete mode 100644 BuildFiles/Packaging/templates/control-common-stable.template delete mode 100644 BuildFiles/Packaging/templates/control-frontend-release.template delete mode 100644 BuildFiles/Packaging/templates/control-frontend-stable.template diff --git a/BuildFiles/Packaging/dependencies/backend-default b/BuildFiles/Packaging/dependencies/backend-default index ff15378d..3422b48a 100644 --- a/BuildFiles/Packaging/dependencies/backend-default +++ b/BuildFiles/Packaging/dependencies/backend-default @@ -4,8 +4,45 @@ libmono-system-management4.0-cil, libmono-system-numerics4.0-cil, libmono-system-web-http4.0-cil, +# +# Mono-devel is repeated here, it's in common as well. Some day we're going to have +# to figure out why the backend refuses to run with a System.Runtime assembly missing +# exception when mono-devel isn't present. +# +# For now, I have to admit it's a convenient cop-out to assure that all the common +# assemblies are in place. +# mono-devel, +# +# Imagemagick is for backend conversion of PDFs to bitmaps. +# imagemagick, +# +# Inkscape, deliberately installed on the backend, is for conversion of generated +# SVG files to PDFs. There are other utilities and libraries that do this but none +# that do it as well and reliably. +# inkscape, +# +# Ghostscript for various PDF handling +# ghostscript, +# +# and Tesseract for a planned-not-yet-implemented OCR reading of inbound invoices +# and other documents +# tesseract-ocr +# +# +# This file is a template included with dependencies for the swarmops backend. +# It is included into the control file when packages are built. If there exists +# a file with the name backend-[distro], it is selected for a distro, otherwise, +# backend-default is used. +# +# Note that all entries are preceded by a space. That's a requirement because +# of how control lines in the debian packages are folded to multiline, and +# this file is included in-situ into the control template. +# +# For the same reason, there can't be any non-comment empty lines, +# or any comment lines first in the file, before the first dependency. + diff --git a/BuildFiles/Packaging/dependencies/common-default b/BuildFiles/Packaging/dependencies/common-default index ecc1416a..df27b79d 100644 --- a/BuildFiles/Packaging/dependencies/common-default +++ b/BuildFiles/Packaging/dependencies/common-default @@ -1,6 +1,33 @@ + mono-devel, +# +# Mono-devel is a cop-out but I can't for my life figure out why the backend +# refuses to run with all its components installed, but runs fine with +# the metapackage mono-devel installed +# +# Still including individual dependencies as detected earlier if I figure +# out exactly why mono-devel is required +# 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 is in Common as it's required by both backend for invoice +# generation and in the frontend for the same reason +# fonts-liberation +# +# +# This file is a template included with dependencies for the swarmops-common package. +# It is included into the control file when packages are built. If there exists +# a file with the name common-[distro], it is selected for a distro, otherwise, +# common-default is used. +# +# Note that all entries are preceded by a space. That's a requirement because +# of how control lines in the debian packages are folded to multiline, and +# this file is included in-situ into the control template. +# +# For the same reason, there can't be any non-comment empty lines, +# or any comment lines first in the file, before the first dependency. + diff --git a/BuildFiles/Packaging/dependencies/frontend-default b/BuildFiles/Packaging/dependencies/frontend-default index 58c821f2..5945fab1 100644 --- a/BuildFiles/Packaging/dependencies/frontend-default +++ b/BuildFiles/Packaging/dependencies/frontend-default @@ -1,10 +1,48 @@ apache2 (>= 2.2.20), +# +# Dialog is required for the "Autoconfigure apache?" dialog +# dialog (>= 1.2), +# +# The xsp4 server +# mono-apache-server4 (>= 3.0.11), +# +# The Mono interface to Apache +# libapache2-mod-mono (>= 2.11), +# +# Mono-devel is repeated here, it's in swarmops-common as well +# mono-devel, +# +# I _think_ this package was required for better image conversions +# libgdiplus (>= 2.11), +# +# Imagemagick is for image conversions +# imagemagick, +# +# Ghostscript is for making/reading PDFs +# ghostscript, +# +# and QPDF is a small utility to count the pages in a PDF file in a script +# qpdf +# +# +# +# This file is a template included with dependencies for the swarmops frontend. +# It is included into the control file when packages are built. If there exists +# a file with the name frontend-[distro], it is selected for a distro, otherwise, +# front-default is used. +# +# Note that all entries are preceded by a space. That's a requirement because +# of how control lines in the debian packages are folded to multiline, and +# this file is included in-situ into the control template. +# +# For the same reason, there can't be any non-comment empty lines, +# or any comment lines first in the file, before the first dependency. diff --git a/BuildFiles/Packaging/templates/control-backend-release.template b/BuildFiles/Packaging/templates/control-backend-release.template deleted file mode 100644 index 03e7e9e8..00000000 --- a/BuildFiles/Packaging/templates/control-backend-release.template +++ /dev/null @@ -1,11 +0,0 @@ -Package: swarmops-backend-stable -Version: --BuildNumber-- -Architecture: all -Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common-stable,mono-runtime (>= 3.2.8),libmono-corlib4.0-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-web-services4.0-cil (>= 3.2.8) -Conflicts: swarmops-backend-internal,swarmops-backend -Homepage: http://swarmops.com/ -Description: Swarmops Backend (Stable) - Swarmops is a swarm activist administration system. - This package is the back-end. It runs on Mono. - Target is Ubuntu 11.10 and up. diff --git a/BuildFiles/Packaging/templates/control-backend-sprint.template b/BuildFiles/Packaging/templates/control-backend-sprint.template index 5912f4d1..8cf57363 100644 --- a/BuildFiles/Packaging/templates/control-backend-sprint.template +++ b/BuildFiles/Packaging/templates/control-backend-sprint.template @@ -1,13 +1,43 @@ +# +# This is the template that is used to create the debian package control file for the +# package swarmops-backend, in the "sprint" (default) flavor. +# +# The ++PackageSuffix++ is expanded to be empty (for release) or "-rc" (for release candidate). +# (In this file, macros are written with pluses in the comments to avoid macro expansion in +# the comments. The actual macros use two minuses.) +# + Package: swarmops-backend--PackageSuffix-- + +# +# The ++BuildNumber++ is replaced with the build number on the format A.B.C-betaXX+buildseqnumber-githubcommit. +# An example might read 5.1.0-beta07+5120-41c03fa. +# + Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) + +# +# ++Dependencies++ are inserted from the Dependencies folder, note that the file starts with +# a space on each line, and so becomes a folding field in this control file. +# Dialog is required for the Apache autoconfiguration and possibly other things in the future. +# Mono-runtime >=5 makes sure user has added the mono sources. This version will update +# to stay ahead of the Ubuntu/Debian LTS inclusions of Mono, for this reason. +# + Depends: swarmops-common--PackageSuffix-- (>= --BuildNumber--),--Dependencies-- + +# +# The Conflicts field prevents installation of other flavors of Swarmops on the same server. +# The ++ReversePackageSuffix++ is the other flavor from ++PackageSuffix++ above. +# + Conflicts: swarmops-backend-internal,swarmops-backend-stable,swarmops-backend--ReversePackageSuffix-- Homepage: http://swarmops.com/ Description: Swarmops Backend Swarmops is a swarm activist administration system. This package is the backend. Multiple frontends can run - on one backend. Target distros are 2016+ Debian Stable + with one backend. Target distros are 2016+ Debian Stable and Ubuntu LTS, which currently means Xenial, Bionic, and Stretch. diff --git a/BuildFiles/Packaging/templates/control-backend-stable.template b/BuildFiles/Packaging/templates/control-backend-stable.template deleted file mode 100644 index c86f75c2..00000000 --- a/BuildFiles/Packaging/templates/control-backend-stable.template +++ /dev/null @@ -1,11 +0,0 @@ -Package: swarmops-backend -Version: --BuildNumber-- -Architecture: all -Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common,mono-runtime,libmono-corlib4.0-cil,libmono-posix4.0-cil,libmono-system-data4.0-cil -Conflicts: swarmops-backend-internal -Homepage: http://swarmops.com/ -Description: Swarmops Backend - Swarmops is a swarm activist administration system. - This package is the back-end. It runs on Mono. - Target is Ubuntu 11.10 and up. diff --git a/BuildFiles/Packaging/templates/control-common-release.template b/BuildFiles/Packaging/templates/control-common-release.template deleted file mode 100644 index f0fb85c5..00000000 --- a/BuildFiles/Packaging/templates/control-common-release.template +++ /dev/null @@ -1,11 +0,0 @@ -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) - Swarmops is a swarm activist administration system. - This package contains the common components between - front-end and back-end. diff --git a/BuildFiles/Packaging/templates/control-common-sprint.template b/BuildFiles/Packaging/templates/control-common-sprint.template index 2148ae63..248adfc5 100644 --- a/BuildFiles/Packaging/templates/control-common-sprint.template +++ b/BuildFiles/Packaging/templates/control-common-sprint.template @@ -1,27 +1,41 @@ # -# The --PackageSuffix-- is expanded to be empty (for release) or "-rc" (for release candidate) +# This is the template that is used to create the debian package control file for the +# package swarmops-common, in the "sprint" (default) flavor. # +# The ++PackageSuffix++ is expanded to be empty (for release) or "-rc" (for release candidate). +# (In this file, macros are written with pluses in the comments to avoid macro expansion in +# the comments. The actual macros use two minuses.) +# + Package: swarmops-common--PackageSuffix-- + # -# The --BuildNumber-- is replaced with the build number on the format A.B.C-betaXX+buildseqnumber-githubcommit +# The ++BuildNumber++ is replaced with the build number on the format A.B.C-betaXX+buildseqnumber-githubcommit. +# An example might read 5.1.0-beta07+5120-41c03fa. # + Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) + # -# Dialog is required for the Apache autoconfiguration -# mono-runtime >=5 makes sure user has added the mono sources, Mono 5 is not yet in Debian/Ubuntu -# --Dependencies-- are picked from the Dependencies folder, note that the file starts with -# a space on each line, and so becomes a folding field in this control file +# ++Dependencies++ are inserted from the Dependencies folder, note that the file starts with +# a space on each line, and so becomes a folding field in this control file. +# Dialog is required for the Apache autoconfiguration and possibly other things in the future. +# Mono-runtime >=5 makes sure user has added the mono sources. This version will update +# to stay ahead of the Ubuntu/Debian LTS inclusions of Mono, for this reason. # + Depends: dialog (>=1.2), mono-runtime (>=5), --Dependencies-- + # -# This prevents installation of other flavors of Swarmops on the same server. -# The --ReversePackageSuffix-- is the other flavor from --PackageSuffix-- above. +# The Conflicts field prevents installation of other flavors of Swarmops on the same server. +# The ++ReversePackageSuffix++ is the other flavor from ++PackageSuffix++ above. # + Conflicts: swarmops-common-internal,swarmops-common-stable,swarmops-common--ReversePackageSuffix-- Homepage: http://swarmops.com/ Description: Swarmops Common Swarmops is a swarm activist administration system. - This package contains the common components between - frontend and backend. + This package contains the common components and + dependencies between frontend and backend. diff --git a/BuildFiles/Packaging/templates/control-common-stable.template b/BuildFiles/Packaging/templates/control-common-stable.template deleted file mode 100644 index 617886a2..00000000 --- a/BuildFiles/Packaging/templates/control-common-stable.template +++ /dev/null @@ -1,10 +0,0 @@ -Package: swarmops-common -Version: --BuildNumber-- -Architecture: all -Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Conflicts: swarmops-common-internal -Homepage: http://swarmops.com/ -Description: Swarmops Backend - Swarmops is a swarm activist administration system. - This package contains the common components between - front-end and back-end. diff --git a/BuildFiles/Packaging/templates/control-frontend-release.template b/BuildFiles/Packaging/templates/control-frontend-release.template deleted file mode 100644 index d921b6e2..00000000 --- a/BuildFiles/Packaging/templates/control-frontend-release.template +++ /dev/null @@ -1,11 +0,0 @@ -Package: swarmops-frontend-stable -Version: --BuildNumber-- -Architecture: all -Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog (>= 1.1), swarmops-common-stable (=> --BuildNumber--), swarmops-frontend-external-scripts (=> --BuildNumber--), apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript -Conflicts: swarmops-frontend-internal,swarmops-frontend -Homepage: http://swarmops.com/ -Description: Swarmops Frontend (Stable) - Swarmops is a swarm activist administration system. - This package is the front-end. It runs on Mono. - Target distros are Trusty, Xenial, Jessie, and Stretch. diff --git a/BuildFiles/Packaging/templates/control-frontend-sprint.template b/BuildFiles/Packaging/templates/control-frontend-sprint.template index f6f0ad8e..b31dcff1 100644 --- a/BuildFiles/Packaging/templates/control-frontend-sprint.template +++ b/BuildFiles/Packaging/templates/control-frontend-sprint.template @@ -1,8 +1,35 @@ +# +# This is the template that is used to create the debian package control file for the +# package swarmops-frontend, in the "sprint" (default) flavor. +# +# The ++PackageSuffix++ is expanded to be empty (for release) or "-rc" (for release candidate). +# (In this file, macros are written with pluses in the comments to avoid macro expansion in +# the comments. The actual macros use two minuses.) +# + Package: swarmops-frontend--PackageSuffix-- + +# +# The ++BuildNumber++ is replaced with the build number on the format A.B.C-betaXX+buildseqnumber-githubcommit. +# An example might read 5.1.0-beta07+5120-41c03fa. +# + Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) + +# +# ++Dependencies++ are inserted from the Dependencies folder, note that the file starts with +# a space on each line, and so becomes a folding field in this control file. +# + Depends: swarmops-common--PackageSuffix-- (>= --BuildNumber--), swarmops-frontend-external-scripts (>= --BuildNumber--), --Dependencies-- + +# +# The Conflicts field prevents installation of other flavors of Swarmops on the same server. +# The ++ReversePackageSuffix++ is the other flavor from ++PackageSuffix++ above. +# + Conflicts: swarmops-frontend-internal,swarmops-frontend-stable,swarmops-frontend--ReversePackageSuffix-- Homepage: http://swarmops.com/ Description: Swarmops Frontend diff --git a/BuildFiles/Packaging/templates/control-frontend-stable.template b/BuildFiles/Packaging/templates/control-frontend-stable.template deleted file mode 100644 index a70e0cc8..00000000 --- a/BuildFiles/Packaging/templates/control-frontend-stable.template +++ /dev/null @@ -1,11 +0,0 @@ -Package: swarmops-frontend -Version: --BuildNumber-- -Architecture: all -Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common, apache2 (>= 2.2.20), mono-apache-server4 (>= 2.10-1), libapache2-mod-mono (>= 2.10-1), libgdiplus (>= 2.10-3), imagemagick, ghostscript -Conflicts: swarmops-frontend-internal -Homepage: http://swarmops.com/ -Description: Swarmops Frontend - Swarmops is a swarm activist administration system. - This package is the front-end. It runs on Mono. - Target is Ubuntu 11.10 and up.