summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRoland Reichwein <mail@reichwein.it>2020-04-26 15:35:31 +0200
committerRoland Reichwein <mail@reichwein.it>2020-04-26 15:35:31 +0200
commitc73f913844f6aed9e740780f8a6732477fa3d680 (patch)
tree06b52646c6100983bf5783862281560833d2959a
parent856c181b7fd9451ce9a6d8181e1cbd0410e4bad4 (diff)
Support current Debian 10 and Ubuntu 1910
-rw-r--r--Makefile6
-rw-r--r--TODO11
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
4 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 41c83c4..c692bf0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DISTROS=debian10
+DISTROS=debian10 ubuntu1910
VERSION=$(shell dpkg-parsechangelog --show-field Version)
PROJECTNAME=webserver
PLUGINS=static-files webbox cgi weblog statistics # fcgi
@@ -13,6 +13,10 @@ ifeq ($(shell which $(CXX)),)
CXX=g++-9
endif
+ifeq ($(shell which $(CXX)),)
+CXX=g++
+endif
+
ifeq ($(CXXFLAGS),)
#CXXFLAGS=-O2 -DNDEBUG
CXXFLAGS=-O0 -g -D_DEBUG
diff --git a/TODO b/TODO
index 5bd65c5..b8f0b41 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,14 @@
+crypt pws
+licence bsd
+Speed up config.GetPath
+
weblog: blättern
weblog: link consistency check (cron?)
weblog: style: zitate
-Integrate into Debian
-Ubuntu version
-Speed up config.GetPath
+Integrate into Debian: Package, License, Lintian, WNPP
read: The socket was closed due to a timeout
webbox: Info if not selected: all
webbox: Copy function
-crypt pws
config consistency: check double keys
redirect-plugin
-licence bsd
+fcgi
diff --git a/debian/changelog b/debian/changelog
index d6456d3..eacca64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ webserver (1.3) unstable; urgency=medium
* Updated weblog
* Added statistics
* Removed upload limit (now 1GB)
+ * Support Ubuntu 1910
-- Roland Reichwein <rr@antcom.de> Sat, 25 Apr 2020 12:35:44 +0200
diff --git a/debian/control b/debian/control
index 5b4833a..930d347 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: webserver
Section: httpd
Priority: extra
Maintainer: Roland Reichwein <mail@reichwein.it>
-Build-Depends: debhelper (>= 9), libssl-dev, libboost-all-dev | libboost1.71-all-dev, clang, node-uglify, htmlmin | tidy, cleancss
+Build-Depends: debhelper (>= 12), libssl-dev, libboost-all-dev | libboost1.71-all-dev, clang | g++-9, node-uglify, htmlmin | tidy, cleancss
Standards-Version: 4.1.3
Homepage: http://www.reichwein.it/webserver/