summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-12-11 10:09:36 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-12-11 10:10:31 +0000
commita2b6a4be570ac07d4a62499bf097264c0718d234 (patch)
tree922d49e1299ef7726198a1212dc247e052be6f59
parentReleasing debian version 20161101-lts1-1. (diff)
downloadopen-infrastructure-service-tools-a2b6a4be570ac07d4a62499bf097264c0718d234.tar.xz
open-infrastructure-service-tools-a2b6a4be570ac07d4a62499bf097264c0718d234.zip
Merging upstream version 20161101-lts2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r--CHANGELOG.txt12
-rw-r--r--README.txt16
-rw-r--r--VERSION1
-rw-r--r--VERSION.txt1
-rw-r--r--share/man/apache-icons.7.txt21
5 files changed, 37 insertions, 14 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d01c102..4fcd828 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,15 @@
+2016-12-10 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20161101-lts2.
+
+ [ 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.
+
2016-11-01 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20161101-lts1.
diff --git a/README.txt b/README.txt
index 4e979c0..54a2fdc 100644
--- a/README.txt
+++ b/README.txt
@@ -36,18 +36,28 @@ apache-icons provides alternative icons for Apache autoindex.
* sudo apt install apache-icons
+3.3 Ubuntu 16.10 (yakkety) and newer
+------------------------------------
+
+ * sudo apt install apache-icons
+
4. Development
--------------
-Bug reports, feature requests, and patches are welcome via Debian Bug Tracking System:
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List:
- * https://bugs.debian.org
+ * https://lists.open-infrastructure.net/listinfo/software
-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
+
5. Known Limitations
--------------------
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 3fa429d..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-20161101-lts1
diff --git a/VERSION.txt b/VERSION.txt
new file mode 100644
index 0000000..5f42ddb
--- /dev/null
+++ b/VERSION.txt
@@ -0,0 +1 @@
+20161101-lts2
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>