Merging upstream version 20161210.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

6 files changed, 36 insertions, 106 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 45dd2b5..0a68450 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,18 @@
+2016-12-10	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20161210.
+
+	[ Daniel Baumann ]
+	* Correcting filename of version file.
+	* Adding note about installation on ubuntu in readme file.
+	* Updating development section in readme file.
+	* Adding note about installation on ubuntu in manpage.
+	* Updating development section in manpage.
+	* Harmonizing asciidoc formatting in manpage.
+	* Replacing README.txt with a copy of apache-tools.7 manpage.
+	* Installing README.txt into documentation directory.
+	* Installing all generic text files as documentation.
+
 2016-11-01	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20161101.
diff --git a/Makefile b/Makefile
index 537f053..13144ac 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,8 @@ all: build
 build: share/man/*.txt
 	$(MAKE) -C share/man
 
+	sed -n '/^NAME/,$$p' share/man/$(SOFTWARE).7.txt > README.txt
+
 	for ICON in share/icons/*; \
 	do \
 		ICON="$$(basename $${ICON})"; \
@@ -45,6 +47,9 @@ build: share/man/*.txt
 	done
 
 install: build
+	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	cp -a CHANGELOG.txt LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+
 	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)
 	cp -a build/* $(DESTDIR)/usr/share/$(SOFTWARE)
 
@@ -89,10 +94,14 @@ uninstall:
 	rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/*
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(SOFTWARE) || true
 
+	rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)/*
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/doc/$(SOFTWARE) || true
+
 clean:
 	$(MAKE) -C share/man clean
 
 	rm -rf build
+	rm -f README.txt
 
 distclean: clean
 
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 4e979c0..0000000
--- a/README.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-apache-icons - Alternative icons for Apache autoindex
-=====================================================
-
-
-1. Description
---------------
-
- "The Apache HTTP Server is the world's most used web server software."
-
-    -- Wikipedia (https://en.wikipedia.org/wiki/Apache_HTTP_Server)
-
-apache-icons provides alternative icons for Apache autoindex.
-
-
-2. Download
------------
-
-  * Upstream Releases: https://files.open-infrastructure.net/software/apache-icons/upstream
-  * Upstream Sources: https://sources.open-infrastructure.net/software/apache-icons
-  * Debian Releases: https://files.open-infrastructure.net/software/apache-icons/debian
-  * Debian Sources: https://sources.progress-linux.org/users/daniel/debian/packages/open-infrastructure-apache-icons
-
-
-3. Installation
----------------
-
-3.1 Source
-----------
-
-  1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc imagemagick librsvg2-bin
-  2. git clone https://sources.open-infrastructure.net/software/apache-icons
-  3. cd apache-icons && sudo make install
-
-3.2 Debian 9 (stretch) and newer
---------------------------------
-
-  * sudo apt install apache-icons
-
-
-4. Development
---------------
-
-Bug reports, feature requests, and patches are welcome via Debian Bug Tracking System:
-
-  * https://bugs.debian.org
-
-Please base them against the 'next' Git branch using common sense:
-
-  * https://www.kernel.org/doc/Documentation/SubmittingPatches
-
-
-5. Known Limitations
---------------------
-
-Changing from one icon set to the other requires a reload of the apache webserver.
-
-
-6. Usage
---------
-
-The default icon theme is determined by the /usr/share/apache-icons/default
-(and /usr/share/apache-icons/default.conf respectivly) file.
-
-On Debian based system "sudo update-alternatives --config apache-icons" can be
-used to automatically select the active icon theme (including the default apache
-icons).
-
-The following themes are available:
-
-  * awesome-png: Font Awesome based, PNG format
-  * awesome-svg: Font Awesome based, SVG format
-  * tango-png: Tango Icons based, PNG format
-  * tango-svg: Tango Icons based, SVG format
-
-The SVG themes are preferable because they are sharper and scale losless.
-They require somewhat modern browsers though.
-
-An example of the tango-svg theme can be seen on
-https://files.open-infrastructure.net.
-
-
-7. Links
---------
-
-  * Font Awesome:
-    http://fontawesome.io/
-
-  * Tango Desktop Project:
-    http://tango.freedesktop.org/
-
-
-8. Authors
-----------
-
-  * Daniel Baumann <daniel.baumann@open-infrastructure.net>
diff --git a/VERSION b/VERSION
deleted file mode 100644
index c2ace56..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-20161101
diff --git a/VERSION.txt b/VERSION.txt
new file mode 100644
index 0000000..d407b1f
--- /dev/null
+++ b/VERSION.txt
@@ -0,0 +1 @@
+20161210
diff --git a/share/man/apache-icons.7.txt b/share/man/apache-icons.7.txt
index 48d7abc..178ba4a 100644
--- a/share/man/apache-icons.7.txt
+++ b/share/man/apache-icons.7.txt
@@ -37,7 +37,6 @@ apache-icons provides alternative icons for Apache autoindex.
 
 DOWNLOAD
 --------
-
   * Upstream Releases: https://files.open-infrastructure.net/software/apache-icons/upstream
   * Upstream Sources: https://sources.open-infrastructure.net/software/apache-icons
   * Debian Releases: https://files.open-infrastructure.net/software/apache-icons/debian
@@ -49,38 +48,42 @@ INSTALLATION
 
 SOURCE
 ~~~~~~
-
   1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc imagemagick librsvg2-bin
   2. git clone https://sources.open-infrastructure.net/software/apache-icons
   3. cd apache-icons && sudo make install
 
 DEBIAN 9 (STRETCH) AND NEWER
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * sudo apt install apache-icons
 
+UBUNTU 16.10 (YAKKETY) AND NEWER
+--------------------------------
   * sudo apt install apache-icons
 
 
 DEVELOPMENT
 -----------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List:
 
-Bug reports, feature requests, and patches are welcome via Debian Bug Tracking System:
+  * https://lists.open-infrastructure.net/listinfo/software
 
-  * https://bugs.debian.org
-
-Please base them against the 'next' Git branch using common sense:
+Please base patches against the 'next' Git branch using common sense:
 
   * https://www.kernel.org/doc/Documentation/SubmittingPatches
 
+Debian specific bugs can also be reported in the Debian Bug Tracking System:
+
+  * https://bugs.debian.org
+
 
 KNOWN LIMITATIONS
 -----------------
-
 Changing from one icon set to the other requires a reload of the apache webserver.
 
 
 USAGE
 -----
-
 The default icon theme is determined by the /usr/share/apache-icons/default
 (and /usr/share/apache-icons/default.conf respectivly) file.
 
@@ -104,7 +107,6 @@ https://files.open-infrastructure.net.
 
 LINKS
 -----
-
 *Font Awesome:*::
 	http://fontawesome.io/
 
@@ -114,5 +116,4 @@ LINKS
 
 AUTHORS
 -------
-
   * Daniel Baumann <daniel.baumann@open-infrastructure.net>