From 2f815b3a69f2e1d95f8d82088ae1b54ba13fb2aa Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 12 Sep 2019 18:27:57 +1000
Subject: [PATCH] changelog update, todo makefile fix

---
 Makefile         |  2 +-
 VERSIONING.md    | 73 ------------------------------------------------
 changelog        |  5 +++-
 debian/changelog |  6 ++--
 debian/docs      |  1 -
 5 files changed, 9 insertions(+), 78 deletions(-)
 delete mode 100644 VERSIONING.md

diff --git a/Makefile b/Makefile
index 7162a49..e7663e5 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ SOURCES = $(NAME).c file.c menu.c string.c platform.c session.c options.c
 HEADERS = functions.h files.h
 OBJECTS = $(SOURCES:.c=.o)
 README  = README.md
-DOCS    = LICENSE README.md INSTALL.md TODO changelog README.Gophermap gophertag
+DOCS    = LICENSE README.md INSTALL.md changelog README.Gophermap gophertag
 
 INSTALL = PATH=$$PATH:/usr/sbin ./install-sh -o 0 -g 0
 DESTDIR = /usr
diff --git a/VERSIONING.md b/VERSIONING.md
deleted file mode 100644
index 988cd0f..0000000
--- a/VERSIONING.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Versioning
-
-## Latest (stable) version
-
-3.0.1
-
-## Changelog
-
-<!--- this should be mirrored from Changelog -->
-
-### 3.0.2 (development)
-
- * update copyright
- * change indentation from tabs to spaces
- * change max width to 67, from 76 (for gophernicus-generated
-   headers/footers
- * change default charset to UTF-8
-
-### 3.0.1
-
- * add installation notes to git checkout before installing
- * fix typo in debian packaging (fixes `make deb`)
- * update docs to reflect new changes
- * fix indenting and typos in docs
-
-### 3.0 (from 101):
-
-**N.B. this version has two important changes that may make it backwards-incompatible:**
-
- * binary changed from in.gophernicus to gophernicus
- * virtual hosting NEVER WORKED and does not work in the way previously described
-
-#### Other changes:
-
- * prevent leak of executable gophermap contents
- * make sure {x,}inetd works when systemd is on the system
- * allow -j flag to work
- * add h9bnks (yargo) and fosslinux into developer roles
- * add -nx flag, blocks executable gophermaps
- * add -nu flag, disable ~/public_gopher
- * modify various documentation to markdown
- * fix various formattings and typos
- * allow inetd targets to work without update-inetd
- * correct handling of inetd.conf
- * remove list of supported platforms
- * remove example gophermaps
- * add dependencies for various distros to INSTALL.md
- * fix query urls
- * add travis ci
- * add documentation about CI
-
-#### Upgrade guide:
-
-If you are running gophernicus on a **production** system, **do not** upgrade to 3.0.
-Wait for 3.1.
-
-As a general guide:
-
-If you are running 101 and haven't upgraded to newer versions **because** of
-instability worries, **wait for 3.1**.
-
-If you were running other rolling-release versions, **upgrade now**.
-
-## History
-
-Gophernicus has had a rough versioning history.
-
-Versions progressed through to 2.6. Then it changed to a rolling-release scheme.
-This dosen't work very well, hence the decision was made to revert to a numbered
-versioning scheme. In some places, it was referred to 101 (the git commit
-number) or 2.99.101 (2.99.gitcommitnumber).
-
-These days (June 2019), the vast majority of gophernicus servers are on 101.
diff --git a/changelog b/changelog
index 42b34cf..5a1c6df 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,11 @@
  * update copyright
  * change indentation from tabs to spaces
  * change max width to 67, from 76 (for gophernicus-generated
-   headers/footers
+   headers/footers)
  * change default charset to UTF-8
+ * add OpenBSD pledge(2) and unveil(2) support
+ * remove TODO
+ * clarify master as development in README
 
 3.0.1
 =====
diff --git a/debian/changelog b/debian/changelog
index 501b37e..9d2e771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,11 @@ gophernicus (3.0.2-1) experimental; urgency=medium
 
  * update copyright
  * change indentation from tabs to spaces
- * change max width to 67, from 76 (for gophernicus-generated
-   headers/footers
+ * change max width to 67, from 76 (for gophernicus-generated headers/footers
  * change default charset to UTF-8
+ * add OpenBSD pledge(2) and unveil(2) support
+ * remove TODO
+ * clarify master as development in README
 
  -- gophernicus developers <gophernicus@gophernicus.org>  Mon, 31 Dec 9999 11:59:59 +0000
 
diff --git a/debian/docs b/debian/docs
index badb454..438e0ab 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,5 @@
 README.md
 README.Gophermap
-TODO
 INSTALL.md
 VERSIONING.md
 changelog