summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/Makefile4
-rw-r--r--docs/manual.md3
-rwxr-xr-xdocs/update-changelog22
-rw-r--r--docs/z-changes-1.0.md5
4 files changed, 32 insertions, 2 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 53dc6fd..83c1d01 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -11,10 +11,10 @@ clean:
rm -f manual.pdf manual.html
manual.pdf: manual.md
- $(PANDOC) $(OPTS) manual.md -o manual.pdf
+ $(PANDOC) $(OPTS) manual.md z-changes-*.md -o manual.pdf
manual.html: manual.md style.css
- $(PANDOC) $(OPTS) manual.md -H webfonts.html -c style.css -o manual.html
+ $(PANDOC) $(OPTS) manual.md z-changes-*.md -H webfonts.html -c style.css -o manual.html
ifeq ($(PANDOC),)
$(warning Pandoc not found!)
diff --git a/docs/manual.md b/docs/manual.md
index cff6f18..19eacca 100644
--- a/docs/manual.md
+++ b/docs/manual.md
@@ -442,3 +442,6 @@ grabbing time:
# The GObject Tango device
[TODO: Get more information from Volker Kaiser and/or Mihael Koep]
+
+
+# Changes
diff --git a/docs/update-changelog b/docs/update-changelog
new file mode 100755
index 0000000..57fe7a6
--- /dev/null
+++ b/docs/update-changelog
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+FROM=$1
+TO=$2
+OUTPUT=$3
+
+echo "## Changes from $FROM to $TO
+" >> tmp
+git log --pretty=format:'* [%h](http://ufo.kit.edu/repos/libuca.git/commit/?id=%h): %s' $FROM..$TO >> tmp
+
+echo "
+" >> tmp
+
+if [ -f "$OUTPUT" ]
+then
+ cat tmp $OUTPUT > tmp_md
+ rm $OUTPUT
+ mv tmp_md $OUTPUT
+ rm tmp
+else
+ mv tmp $OUTPUT
+fi
diff --git a/docs/z-changes-1.0.md b/docs/z-changes-1.0.md
new file mode 100644
index 0000000..4628b37
--- /dev/null
+++ b/docs/z-changes-1.0.md
@@ -0,0 +1,5 @@
+## Changes from v1.0 to v1.0.1
+
+* [5d99f27](http://ufo.kit.edu/repos/libuca.git/commit/?id=5d99f27): Bump version to prepare for SO fix
+* [178298f](http://ufo.kit.edu/repos/libuca.git/commit/?id=178298f): Set SO version to major not minor version
+