Recent changes to this wiki:

Add Librem5 status update
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index aeac237..959192e 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks / BoFs
 
+[The Librem-5 Phone (status update)](https://git.sigxcpu.org/cgit/talks/2018-fsfe-librem5-2/plain/talk.pdf) at [FSFE Group Meeting Bonn](https://wiki.fsfe.org/LocalGroups/Bonn), Bonn, Germany, October 2018
+
 [The Librem-5 Phone](https://git.sigxcpu.org/cgit/talks/2018-fsfe-librem5/plain/talk.pdf) at [FSFE Group Meeting Bonn](https://wiki.fsfe.org/LocalGroups/Bonn), Bonn, Germany, May 2018
 
 [Securing Kopano with Apparmor](https://git.sigxcpu.org/cgit/talks/2017-kopanocon-kopano-apparmor/plain/talk.pdf) at [Kopano Conference 2017](https://kopano.com/conference/), Arnhem, Netherlands, September 2017

Mention gbp ansible role
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 9b9fb73..1be3ef2 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -61,6 +61,7 @@ Here's my current [[gbp.conf]].
 * [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available.
 * [Chef Cookbook for gbp][1]
 * [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Large parts have been merged into *gbp*.
+* [ansible-role-gbp][3] - an ansible role to configure git-buildpackge and pbuilder/cowbuilder.
 
 ## Todo
 * templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])
@@ -76,3 +77,4 @@ git-buildpackage is free software and licensed under the GPL Version 2.
 [0]: http://www.eyrie.org/~eagle/software/scripts/git-pbuilder.html
 [1]: https://github.com/mlafeldt/gbp-cookbook
 [2]: https://github.com/marquiz/git-buildpackage-rpm
+[3]: https://galaxy.ansible.com/agx/gbp

Add Librem-5 talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index c9e245b..aeac237 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks / BoFs
 
+[The Librem-5 Phone](https://git.sigxcpu.org/cgit/talks/2018-fsfe-librem5/plain/talk.pdf) at [FSFE Group Meeting Bonn](https://wiki.fsfe.org/LocalGroups/Bonn), Bonn, Germany, May 2018
+
 [Securing Kopano with Apparmor](https://git.sigxcpu.org/cgit/talks/2017-kopanocon-kopano-apparmor/plain/talk.pdf) at [Kopano Conference 2017](https://kopano.com/conference/), Arnhem, Netherlands, September 2017
 
 [Whats new in git-buildpackage](https://git.sigxcpu.org/cgit/talks/2017-dc17-gbp-light/tree/gbp.org) [(Live Demo)](https://debconf17.debconf.org/talks/45/) at [Debconf 17](https://debconf17.debconf.org/), Montreal, Canada, August 2017 ([video, starts at ~11:00](https://ftp.acc.umu.se/pub/debian-meetings/2017/debconf17/live-demos.vp8.webm))

Updates from Carsten
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
index 76e19fc..c7f882f 100644
--- a/hepl/hepl2.mdwn
+++ b/hepl/hepl2.mdwn
@@ -24,6 +24,7 @@
 * Uploaded Thunderbird 52.5 to Wheezy
 * New packages for [selenium](https://anonscm.debian.org/git/users/sagiru-guest/python-selenium.git) prepared
 * New packages for [iptables-converter](https://github.com/sl0/conv) prepared
+* New packages kopano-webapp-plugin-files uploaded to Debian's NEW queue
 * Got [Weston](https://github.com/wayland-project/weston) on the Boundary Devices i.MX6 Quad board to run (and
-  partially [Maynard](https://github.com/raspberrypi/maynard/wiki) as well)
-
+  partially [Maynard](https://github.com/raspberrypi/maynard/wiki) as well), added a firmware package
+* Further work on getting the free parts of ngspice into Debian main

Low volume list
diff --git a/hepl.mdwn b/hepl.mdwn
index e501ba9..6b60d5a 100644
--- a/hepl.mdwn
+++ b/hepl.mdwn
@@ -5,7 +5,9 @@ Hacking event happening between Bonn and Koblenz in [Erpel][].
 
 [[!map pages="hepl/* and ! hepl/*/*"]]
 
-There's a [mailing list][] too that will get announcements of upcoming HEPLs.
+There's a [mailing list][] that will get announcements of upcoming
+HEPLs and summaries of past events. It's extremely low volume with
+about <10 messages per year.
 
 [Erpel]: https://de.wikipedia.org/wiki/Erpel
 [mailing list]: https://lists.sigxcpu.org/mailman/listinfo/hepl

Update
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
index be26ff0..76e19fc 100644
--- a/hepl/hepl2.mdwn
+++ b/hepl/hepl2.mdwn
@@ -1,11 +1,13 @@
 # HEPL2
 
 * When: *2017-12-09*
-* Number of patricipants: *?*
-* Bowls of Chilli Con Soja: *?*
-* Mates drank: *?*
+* Number of patricipants: 4
+* Bowls of Chilli Con Soja cooked: *1*
+* Bowls of Chilli Con Soja eaten: *1*
 * Number of Debian Bugs fixed: *?*
-* Files transferred via XMPP: *?*
+* Number of package uploads: 2
+* Files transferred via XMPP: 5
+* Number of new XMPP accounts: 1
 
 ## Participants
 * Carsten Schönert
@@ -17,7 +19,11 @@
 
 * apt-cacher: deb http://apt:9999/debian/ <dist> main contrib non-free
 
-## Planned Things
+## Done Things
 
-* Flash the remaining Merkur Boards.
+* Uploaded Thunderbird 52.5 to Wheezy
+* New packages for [selenium](https://anonscm.debian.org/git/users/sagiru-guest/python-selenium.git) prepared
+* New packages for [iptables-converter](https://github.com/sl0/conv) prepared
+* Got [Weston](https://github.com/wayland-project/weston) on the Boundary Devices i.MX6 Quad board to run (and
+  partially [Maynard](https://github.com/raspberrypi/maynard/wiki) as well)
 

Sort participants alphabetically
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
index f88f7af..be26ff0 100644
--- a/hepl/hepl2.mdwn
+++ b/hepl/hepl2.mdwn
@@ -1,4 +1,4 @@
-# HEPL1
+# HEPL2
 
 * When: *2017-12-09*
 * Number of patricipants: *?*
@@ -8,8 +8,8 @@
 * Files transferred via XMPP: *?*
 
 ## Participants
-* [[Guido Günther|agx]]
 * Carsten Schönert
+* [[Guido Günther|agx]]
 * Johannes Hubertz
 * Sascha Girrulat
 

Add apt-cacher
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
index fd65d0c..f88f7af 100644
--- a/hepl/hepl2.mdwn
+++ b/hepl/hepl2.mdwn
@@ -13,6 +13,10 @@
 * Johannes Hubertz
 * Sascha Girrulat
 
+## Infra
+
+* apt-cacher: deb http://apt:9999/debian/ <dist> main contrib non-free
+
 ## Planned Things
 
 * Flash the remaining Merkur Boards.

Drop trailing colon
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index dae1493..9b9fb73 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -68,7 +68,7 @@ Here's my current [[gbp.conf]].
 * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system
 
 ## Author
-:git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the [changelog](https://git.sigxcpu.org/cgit/git-buildpackage/tree/debian/changelog) for attributions.
+*git-buildpackage* was written by [[Guido Günther|/agx]] with contributions from many individuals. See the [changelog](https://git.sigxcpu.org/cgit/git-buildpackage/tree/debian/changelog) for attributions.
 
 ## License
 git-buildpackage is free software and licensed under the GPL Version 2.

gbp: Document how to report security issues.
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index d8396a6..dae1493 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -52,6 +52,8 @@ For enhancements and feature requests you can either use the [Debian bugtracking
 
 [[!template  id=honk_ml project="git-buildpackage"]]
 
+If you encounter a security issue please report it via the above channels.
+
 ## gbp.conf
 Here's my current [[gbp.conf]].
 

Add participants
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
index 0774eea..fd65d0c 100644
--- a/hepl/hepl2.mdwn
+++ b/hepl/hepl2.mdwn
@@ -10,6 +10,8 @@
 ## Participants
 * [[Guido Günther|agx]]
 * Carsten Schönert
+* Johannes Hubertz
+* Sascha Girrulat
 
 ## Planned Things
 

Carsten intends to attend hepl2
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
index 59eb5a8..0774eea 100644
--- a/hepl/hepl2.mdwn
+++ b/hepl/hepl2.mdwn
@@ -9,6 +9,7 @@
 
 ## Participants
 * [[Guido Günther|agx]]
+* Carsten Schönert
 
 ## Planned Things
 

Add hepl2
diff --git a/hepl/hepl2.mdwn b/hepl/hepl2.mdwn
new file mode 100644
index 0000000..59eb5a8
--- /dev/null
+++ b/hepl/hepl2.mdwn
@@ -0,0 +1,16 @@
+# HEPL1
+
+* When: *2017-12-09*
+* Number of patricipants: *?*
+* Bowls of Chilli Con Soja: *?*
+* Mates drank: *?*
+* Number of Debian Bugs fixed: *?*
+* Files transferred via XMPP: *?*
+
+## Participants
+* [[Guido Günther|agx]]
+
+## Planned Things
+
+* Flash the remaining Merkur Boards.
+

Fix HEPL0 date
diff --git a/hepl/hepl0.mdwn b/hepl/hepl0.mdwn
index d75492b..20990ce 100644
--- a/hepl/hepl0.mdwn
+++ b/hepl/hepl0.mdwn
@@ -1,6 +1,6 @@
 # HEPL0
 
-* When: 2015-07-13
+* When: 2013-07-13
 * Number of patricipants: 6
 * Number of Tofu sausages: *unknown*
 * Number of Debian Bugs fixed: *unknown*

gbp: Mention rpm tools
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index bba2d9b..d8396a6 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -21,7 +21,8 @@ GBP ships the following tools:
 * *gbp tag*: tag a Debian package in git
 * *gbp pristine-tar*: create pristine-tar commits
 
-There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
+There's also some support for maintaining RPMs in (*gbp buildpackage-rpm*, *gbp import-srpm*, *gbp pq-rpm*, *gbp rpm-ch*).
+and helpers in */usr/share/doc/git-buildpackage/examples/*:
 
 * *gbp-add-patch*: Commits a patch to the current branch and uses the patch header for the commit message, useful after *gbp pq export*.
 
@@ -57,7 +58,7 @@ Here's my current [[gbp.conf]].
 ## Related Tools
 * [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available.
 * [Chef Cookbook for gbp][1]
-* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Large parts merged into gbp already.
+* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Large parts have been merged into *gbp*.
 
 ## Todo
 * templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])

gbp: update URLs to https and short versions
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 339f101..bba2d9b 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -26,9 +26,9 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 * *gbp-add-patch*: Commits a patch to the current branch and uses the patch header for the commit message, useful after *gbp pq export*.
 
 ## Documentation
-* git-buildpackage's [official manual](http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html).
+* git-buildpackage's [official manual](https://gbp.sigxcpu.org/manual).
 * A possible workflow for maintaining [[development/debian packages in git]].
-* The current [api documentation](http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/) in case you want to extend git-buildpackage.
+* The current [api documentation](https://gbp.sigxcpu.org/apidocs) in case you want to extend git-buildpackage.
 The usage of the *GitRepository* class is shown (and tested) in
 [test_GitRepository](https://honk.sigxcpu.org/projects/git-buildpackage/apidocs/doctests.test_GitRepository.html).
 
@@ -47,7 +47,7 @@ If not on a Debian system you can fetch the package from [pypi](https://pypi.pyt
     pip install gbp
 
 ## Bugreports
-For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
+For enhancements and feature requests you can either use the [Debian bugtracking system](https://bugs.debian.org/git-buildpackage) or email [me](mailto:agx@sigxcpu.org) directly.
 
 [[!template  id=honk_ml project="git-buildpackage"]]
 
@@ -65,7 +65,7 @@ Here's my current [[gbp.conf]].
 * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system
 
 ## Author
-git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the [changelog](https://git.sigxcpu.org/cgit/git-buildpackage/tree/debian/changelog) for attributions.
+:git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the [changelog](https://git.sigxcpu.org/cgit/git-buildpackage/tree/debian/changelog) for attributions.
 
 ## License
 git-buildpackage is free software and licensed under the GPL Version 2.

gbp: update list of commands
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index ac098f1..339f101 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -7,20 +7,23 @@ Suite to help with maintaining [Debian](http://www.debian.org) packages in [Git]
 ## Tools
 GBP ships the following tools:
 
+* *gbp buildpackage*: build a package out of a git repository, check for local modifications and tag appropriately
 * *gbp import-{dsc,dscs}*: import existing Debian source packages into a git repository
 * *gbp import-orig*: import a new upstream version into the git repository
-* *gbp buildpackage*: build a package out of a git repository, check for local modifications and tag appropriately
+* *gbp export-orig*: export an upstream tarball from the git repository
 * *gbp dch*: generate Debian changelog entries from Git commit messages
 * *gbp pq*: maintain *debian/patches* on a patch queue branch
 * *gbp clone*: clone a remote repository and make it ready for *gbp buildpackage*
 * *gbp pull*: pull from a remote repository and update the necessary branches
 * *gbp create-remote-repo*: mirror your git repository to a remote side
 * *gbp config*: print configuration values
+* *gbp push*: push content to remote repositories
+* *gbp tag*: tag a Debian package in git
+* *gbp pristine-tar*: create pristine-tar commits
 
 There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 
-* *gbp-posttag-push*: posttag hook for *gbp buildpackage* to push out the necessary changes to a remote repository after a release
-* *gbp-add-patch*: Commits a patch to the current branch and uses the Path Header for the commit message, useful after *gbp pq export*.
+* *gbp-add-patch*: Commits a patch to the current branch and uses the patch header for the commit message, useful after *gbp pq export*.
 
 ## Documentation
 * git-buildpackage's [official manual](http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html).
@@ -39,7 +42,6 @@ There's also a clone on [github](https://github.com/agx/git-buildpackage).
 Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]].
 
 ### Pypi
-
 If not on a Debian system you can fetch the package from [pypi](https://pypi.python.org/pypi/gbp):
 
     pip install gbp

Add gbp logo
diff --git a/local.css b/local.css
index a72a9fb..d0ae118 100644
--- a/local.css
+++ b/local.css
@@ -195,3 +195,7 @@ form#signin {
 	overflow: auto;
 }
 
+div.project_logo {
+	float: right;
+	z-index: 1;
+}
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index d617bf3..ac098f1 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -2,6 +2,8 @@ Suite to help with maintaining [Debian](http://www.debian.org) packages in [Git]
 
 [[!toc]]
 
+[[!template id=project_logo img="gbp.png"]]
+
 ## Tools
 GBP ships the following tools:
 
diff --git a/projects/git-buildpackage/gbp.png b/projects/git-buildpackage/gbp.png
new file mode 100644
index 0000000..92e41a0
Binary files /dev/null and b/projects/git-buildpackage/gbp.png differ
diff --git a/templates/project_logo b/templates/project_logo
new file mode 100644
index 0000000..eeab276
--- /dev/null
+++ b/templates/project_logo
@@ -0,0 +1,4 @@
+<div class="project_logo">
+<img src="<TMPL_VAR img>" alt="logo" />
+</div>
+

Use comma consistently between country and year
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index aba54dd..c9e245b 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,24 +1,24 @@
 ### Talks / BoFs
 
-[Securing Kopano with Apparmor](https://git.sigxcpu.org/cgit/talks/2017-kopanocon-kopano-apparmor/plain/talk.pdf) at [Kopano Conference 2017](https://kopano.com/conference/), Arnhem Netherlands, September 2017
+[Securing Kopano with Apparmor](https://git.sigxcpu.org/cgit/talks/2017-kopanocon-kopano-apparmor/plain/talk.pdf) at [Kopano Conference 2017](https://kopano.com/conference/), Arnhem, Netherlands, September 2017
 
-[Whats new in git-buildpackage](https://git.sigxcpu.org/cgit/talks/2017-dc17-gbp-light/tree/gbp.org) [(Live Demo)](https://debconf17.debconf.org/talks/45/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017 ([video, starts at ~11:00](https://ftp.acc.umu.se/pub/debian-meetings/2017/debconf17/live-demos.vp8.webm))
+[Whats new in git-buildpackage](https://git.sigxcpu.org/cgit/talks/2017-dc17-gbp-light/tree/gbp.org) [(Live Demo)](https://debconf17.debconf.org/talks/45/) at [Debconf 17](https://debconf17.debconf.org/), Montreal, Canada, August 2017 ([video, starts at ~11:00](https://ftp.acc.umu.se/pub/debian-meetings/2017/debconf17/live-demos.vp8.webm))
 
-[Debian LTS and Security Team BoF](https://debconf17.debconf.org/talks/217/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017
+[Debian LTS and Security Team BoF](https://debconf17.debconf.org/talks/217/) at [Debconf 17](https://debconf17.debconf.org/), Montreal, Canada, August 2017
 
-[The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands October 2016
+[The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands, October 2016
 
-GBP skills exchange at [Debconf 16](https://debconf16.debconf.org/talks/132/), Cape Town, South Africa July 2016
+GBP skills exchange at [Debconf 16](https://debconf16.debconf.org/talks/132/), Cape Town, South Africa, July 2016
 
-[Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
+[Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany, May 2016
 
 [Debian - 22 years and counting](http://honk.sigxcpu.org/talks/2015-09-zarafa/) at [Zarafa Tour 2015](https://www.zarafa.com/register-for-zarafa-tour-2015-the-netherlands-edition/), Woubrugge near Amsterdam, Netherlands, 2015
 
-[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])
+[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany, 2015 ([video][6])
 
-[[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015
+[[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany, 2015
 
-[[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2014
+[[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany, 2014
 
 [[Debian 360°|2013-12-debian.pdf]] at [FSFE Fellowship Meeting](https://wiki.fsfe.org/FellowshipEvents/Fellowship%20Meeting%20Bonn%202013-12), Bonn, Germany, 2013
 

Add Kopano Apparmor talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index d0c521d..aba54dd 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks / BoFs
 
+[Securing Kopano with Apparmor](https://git.sigxcpu.org/cgit/talks/2017-kopanocon-kopano-apparmor/plain/talk.pdf) at [Kopano Conference 2017](https://kopano.com/conference/), Arnhem Netherlands, September 2017
+
 [Whats new in git-buildpackage](https://git.sigxcpu.org/cgit/talks/2017-dc17-gbp-light/tree/gbp.org) [(Live Demo)](https://debconf17.debconf.org/talks/45/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017 ([video, starts at ~11:00](https://ftp.acc.umu.se/pub/debian-meetings/2017/debconf17/live-demos.vp8.webm))
 
 [Debian LTS and Security Team BoF](https://debconf17.debconf.org/talks/217/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017

Fix link
diff --git a/donations.mdwn b/donations.mdwn
index 37b77d1..5d80c21 100644
--- a/donations.mdwn
+++ b/donations.mdwn
@@ -3,7 +3,8 @@
 In case you find any of the sigxcpu.org [[projects|index]] useful and you want
 to support my work you can do so either by:
 
-* [Donating to 15PmH1c9TdcGJyYNyXdEhCFUdPc9FEhiff](1https://blockchain.info/address/5PmH1c9TdcGJyYNyXdEhCFUdPc9FEhiff) via bitcoin.
+* Donating to Bitcoin address [15PmH1c9TdcGJyYNyXdEhCFUdPc9FEhiff][2]
 * Hiring me as a [freelancer][1] to work on these projects.
 
 [1]: http://godiug.net
+[2]: https://blockchain.info/address/15PmH1c9TdcGJyYNyXdEhCFUdPc9FEhiff

Add bitcoin address for donations
diff --git a/donations.mdwn b/donations.mdwn
index 7852513..37b77d1 100644
--- a/donations.mdwn
+++ b/donations.mdwn
@@ -3,6 +3,7 @@
 In case you find any of the sigxcpu.org [[projects|index]] useful and you want
 to support my work you can do so either by:
 
+* [Donating to 15PmH1c9TdcGJyYNyXdEhCFUdPc9FEhiff](1https://blockchain.info/address/5PmH1c9TdcGJyYNyXdEhCFUdPc9FEhiff) via bitcoin.
 * Hiring me as a [freelancer][1] to work on these projects.
 
 [1]: http://godiug.net

Add debconf17 live demo
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 623e74e..d0c521d 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks / BoFs
 
+[Whats new in git-buildpackage](https://git.sigxcpu.org/cgit/talks/2017-dc17-gbp-light/tree/gbp.org) [(Live Demo)](https://debconf17.debconf.org/talks/45/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017 ([video, starts at ~11:00](https://ftp.acc.umu.se/pub/debian-meetings/2017/debconf17/live-demos.vp8.webm))
+
 [Debian LTS and Security Team BoF](https://debconf17.debconf.org/talks/217/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017
 
 [The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands October 2016

Add lts and sec team bof
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 2aa9257..623e74e 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,6 +1,8 @@
 ### Talks / BoFs
 
-[The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands Octover 2016
+[Debian LTS and Security Team BoF](https://debconf17.debconf.org/talks/217/) at [Debconf 17](https://debconf17.debconf.org/), Montreal Canada, August 2017
+
+[The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands October 2016
 
 GBP skills exchange at [Debconf 16](https://debconf16.debconf.org/talks/132/), Cape Town, South Africa July 2016
 

creating index page projects/git-buildpackage/videos
diff --git a/projects/git-buildpackage/videos.mdwn b/projects/git-buildpackage/videos.mdwn
new file mode 100644
index 0000000..aa0353b
--- /dev/null
+++ b/projects/git-buildpackage/videos.mdwn
@@ -0,0 +1 @@
+[[!map pages="projects/git-buildpackage/videos/* and ! projects/git-buildpackage/videos/*/*"]]

Add gbp-pq video
diff --git a/projects/git-buildpackage/videos/gbp-pq-new-upstream-version.ogv b/projects/git-buildpackage/videos/gbp-pq-new-upstream-version.ogv
new file mode 100644
index 0000000..541417e
Binary files /dev/null and b/projects/git-buildpackage/videos/gbp-pq-new-upstream-version.ogv differ

gbp: patch handling moved to gbp's manual
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn
index b68ae5c..023048d 100644
--- a/development/debian_packages_in_git.mdwn
+++ b/development/debian_packages_in_git.mdwn
@@ -1,95 +1,8 @@
 [[!toc]]
 
 # Keeping debian/patches on a patch-queue branch
-I'm keeping all patches for a Debian package that is maintained on branch *foo* on a patch-queue branch *patch-queue/foo*:
 
-* One can easily work with the unpatched (*foo*) and patched (*patch-queue/foo*) branches
-* One commit on the *patch-queue* branch represents exactly on patch in *debian/patches/*
-* Patches can easily be dropped, added by modifying the patch-queue branch (no messing with *quilt add*, *dpatch-edit-patch*, *cdbs-edit-patch* or the like)
-* Easy cherry-picking of patches for stable releases, etc.
-* Easy forward porting of patches to new upstream versions by using *git rebase* on the *patch-queue/foo* branch (patches already applied upstream are detected automatically).
-* The generated patch in *debian/patches/* has all the necessary information to forward it upstream since it's auto generated via *git-format-patch*.
-
-Disadvantage:
-
-* no history on the *patch-queue/foo* branch, but you do have the history on *foo* of course. 
-
-### Workflow:
-Assuming the Debian source package has it's patches in *debian/patches* and these are parseable by *git-quiltimport(1)*:
-
-* Create *patch-queue* branch and import *debian/patches* onto it using gbp-pq:
-
-        cd $REPO
-        gbp pq import
-* This will switch you to the patch-queue branch automatically. If you started from *master* the patch-queue branch will be called *patch-queue/master*.
-* Now you can work on the patch-queue branch (add, remove, rebase, test) to get your patches into shape:
-    * To add what will later become a patch in *debian/patches/* simply make a commit. The first line of the commit message will become the patch name later. The following lines include the details of what the patch does.
-    * To remove or edit commits use *git rebase -i master*. The [git documentation][] explains how to work with git-rebase.
-* Regenerate the patches in *debian/patches/* using gbp-pq. This will switch you back to *master* and regenerate the patches using *git-format-patch(1)*:
-
-        gbp pq export
-* Commit the result either by using *gbp-add-patch* or simply
-
-        git add debian/patches
-        git commit
-* Update *debian/changelog* (e.g. by running "git-dch -S -a")
-* Build the package
-* After importing a new upstream version you can use the following commands to refresh *debian/patches*:
-
-        gbp pq rebase
-        git checkout master
-        gbp pq export
-* If a package doesn't have any patches yet, these are the steps to add your first patch:
-
-    1. Launch an import, this will switch to the proper branch
-
-            gbp pq import
-    2. Create your first patch:
-
-          * Edit files / Test
-          * Commit your changes using *git commit*
-    3. Back to the master branch, generate the Quilt patch set
-
-            git checkout master
-            gbp pq export
-    4. Commit you first patch
-        
-            git add -a debian/patches/
-            git commit -m 'my first patch'
-
-If you want to pick the changelog message from the patch see
-*/usr/share/doc/git-buildpackage/examples/gbp-add-patch*.
-
-### Team maintenance
-The easiest way is to not push out any patch-queue/* branches at all. They can be recreated by any team member easily by using
-
-    git branch -d patch-queue/master
-    gbp pq import
-
-However you *can* push out patch-queue branches. Other team members must just be aware that that branches in the *patch-queue/* namespace are being rebased frequently.
-
-# Working with 3.0 (quilt) packges
-The 3.0 (quilt) format applies the patches in *debian/patches* automatically when building a source package.
-If you want your debian branch to contain the unpatched source there are several ways to handle this:
-
-## Using debian/source/local-options
-You can use *unapply-patches* in *debian/source/local-options* to unapply the
-patches after the build.
-*/usr/share/doc/git-buildpackage/examples/gbp-configure-unpatched-source* will
-this set up for you when run from inside a git repository of a Debian package.
-  
-## Using --git-export-dir
-If you're using option *--git-export-dir* option already there's no problem since the unpatched source tree gets exported before being built (and patch by dpkg-source). Since this implies an extra copy of the whole source tree (which might be slow for big projects) and it's not really necessary when using pbuilder the next method might be more appropriate.
-
-## Working from a patch-queue branch
-Instead of building from *master* build from *patch-queue/master* prepared by *gbp-pq* as describe above. This branch has the patches already applied as dpkg-source expects it:
-    
-    gbp pq import
-    gbp buildpackage --git-debian-branch=patch-queue/master
-Build and test...
-
-    git checkout master
-    gbp pq export
+This part moved to gbp's [manual](https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.patches.html)
 
 # Cloning a repository
 If you use *gbp clone* instead of *git clone* to clone a remote repository it will automatically set up the *debian*, *upstream* and *pristine-tar* branches for you. The [manual][] explains the terminology.
@@ -129,7 +42,7 @@ I keep backports on a separate *bpo-<release>* branch like *bpo-lenny*:
     gbp buildpackage --git-pbuilder --git-dist=lenny -sa -v <last-backported-version> --git-debian-branch=bpo-lenny
 
 In order to avoid the merge conflict in the changelog have a look at *dpkg-mergechangelogs(1)*. To create the necessary cowbuilder chroot for Lenny use:
-    
+
     DIST=lenny git-pbuilder create
 
 

Update link to GitRepository examples
now that we switched to pydoctor
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 8856051..d617bf3 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -25,7 +25,7 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 * A possible workflow for maintaining [[development/debian packages in git]].
 * The current [api documentation](http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/) in case you want to extend git-buildpackage.
 The usage of the *GitRepository* class is shown (and tested) in
-[test_GitRepository](http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/tests.test_GitRepository-module.html).
+[test_GitRepository](https://honk.sigxcpu.org/projects/git-buildpackage/apidocs/doctests.test_GitRepository.html).
 
 ## Download
 

Use git.sigxcpu.org to clone repos
the git service on honk is disabled since ages.
diff --git a/development/sigxcpu.org_git_repositories.mdwn b/development/sigxcpu.org_git_repositories.mdwn
index 2816d7a..7082fce 100644
--- a/development/sigxcpu.org_git_repositories.mdwn
+++ b/development/sigxcpu.org_git_repositories.mdwn
@@ -4,8 +4,8 @@ sigxcpu.org's GIT repositories are located at:
 
 You can clone them by running:
 
-    git clone git://honk.sigxcpu.org/git/$REPO
+    git clone https://git.sigxcpu.org/cgit/$REPO
 
 e.g.:
 
-    git clone git://honk.sigxcpu.org/git/git-buildpackage.git
+    git clone https://git.sigxcpu.org/cgit/git-buildpackage

Add links
diff --git a/agx.mdwn b/agx.mdwn
index 7b8d211..3419a61 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -1,10 +1,10 @@
 [Guido Günther](/con/) <<agx@sigxcpu.org>>
 
-* GPG Key-ID: 0xB999CDB58C8DDBD2, Fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
+* GPG Key-ID: [0xB999CDB58C8DDBD2](https://honk.sigxcpu.org/misc/agx@sigxcpu.org.gpg), Fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
 * Jabber/XMPP: agx@sigxcpu.org
 * List of [[Publications]] (talks, papers, etc.)
 * [Blog](http://honk.sigxcpu.org/con)
 * [Microblog/Twitter](https://twitter.com/GuidoGuenther)
 * [Ohloh](http://www.ohloh.net/accounts/agx)
 * [github](http://github.com/agx)
-* [Bitcoin](https://blockchain.info/address/125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry)
+* Bitcoin: [125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry](https://blockchain.info/address/125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry)

Add bitcoin address
diff --git a/agx.mdwn b/agx.mdwn
index 0df4e5c..7b8d211 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -7,3 +7,4 @@
 * [Microblog/Twitter](https://twitter.com/GuidoGuenther)
 * [Ohloh](http://www.ohloh.net/accounts/agx)
 * [github](http://github.com/agx)
+* [Bitcoin](https://blockchain.info/address/125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry)

Update GPG key
diff --git a/agx.mdwn b/agx.mdwn
index ad78c65..0df4e5c 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -1,7 +1,7 @@
 [Guido Günther](/con/) <<agx@sigxcpu.org>>
 
-* GPG Key-ID: 3F3E6426, Fingerprint: FBDF 66F8 4CAC 5E58 8EC4  77E4 9FCF 2CCD 3F3E 6426
-* Jabber: agx@sigxcpu.org
+* GPG Key-ID: 0xB999CDB58C8DDBD2, Fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
+* Jabber/XMPP: agx@sigxcpu.org
 * List of [[Publications]] (talks, papers, etc.)
 * [Blog](http://honk.sigxcpu.org/con)
 * [Microblog/Twitter](https://twitter.com/GuidoGuenther)

More qemu debugging
diff --git a/development/qemu-debugging.mdwn b/development/qemu-debugging.mdwn
index 44a8a7c..ed30a17 100644
--- a/development/qemu-debugging.mdwn
+++ b/development/qemu-debugging.mdwn
@@ -14,14 +14,20 @@ output goes to /var/log/libvirt/qemu/<vm>.log by default
             <target dir='ltstest'/>
         </filesystem>
 
-*mapped* is important. It uses extended attributes so it needs user_xattr on the host filesystem.
+*mapped* is important. It uses extended attributes so the filesystem that
+needs to be mounted with *user_xattr* on the host filesystem and the folder
+needs to be writeable by qemu:
 
-Guests fstab:
+        mount -o remount,user_xattr /cache/ltstest
+        chown libvirt-qemu /cache/ltstest
+
+The Guests fstab then uses:
 
     ltstest /ltstest 9p   trans=virtio,version=9p2000.L,rw 0 0
 
-Do
+After mounting you can write from the guest to the hosts fileystem:
 
+    mount /ltstest
     cd /ltstest && touch a
 
 results on the host as extended attributes
@@ -61,3 +67,10 @@ via QMP monitor:
 * List all devices:
 
         qemu-system-x86_64 -device ?
+
+* Enabling the monitor on raw qemu
+
+        $ qemu-system-i386 -qmp tcp:localhost:4444,server,nowait
+		$ telnet localhost 4444
+		{ "execute": "qmp_capabilities" }
+		{"execute": "commands"}

Mention pypi
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index fc15a45..8856051 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -27,13 +27,20 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 The usage of the *GitRepository* class is shown (and tested) in
 [test_GitRepository](http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/tests.test_GitRepository-module.html).
 
+## Download
 
 [[!template  id=honk_git repo="git-buildpackage"]]
 
 There's also a clone on [github](https://github.com/agx/git-buildpackage).
 
-## Debian packages
-Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]]. Git snapshots are available [here](http://honk.sigxcpu.org:8001/job/git-buildpackage/).
+### Debian packages
+Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]].
+
+### Pypi
+
+If not on a Debian system you can fetch the package from [pypi](https://pypi.python.org/pypi/gbp):
+
+    pip install gbp
 
 ## Bugreports
 For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
@@ -54,7 +61,7 @@ Here's my current [[gbp.conf]].
 * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system
 
 ## Author
-git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the changelog for attributions.
+git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the [changelog](https://git.sigxcpu.org/cgit/git-buildpackage/tree/debian/changelog) for attributions.
 
 ## License
 git-buildpackage is free software and licensed under the GPL Version 2.

Add skeleton
diff --git a/development/qemu-debugging.mdwn b/development/qemu-debugging.mdwn
new file mode 100644
index 0000000..44a8a7c
--- /dev/null
+++ b/development/qemu-debugging.mdwn
@@ -0,0 +1,63 @@
+# Enable tracing
+In virsh
+
+     qemu-monitor-command <vm> --hmp trace-event usb_xhci_* on
+     qemu-monitor-command <vm> --hmp info trace-events
+
+output goes to /var/log/libvirt/qemu/<vm>.log by default
+
+# 9pfs
+* Libvirt XML
+
+        <filesystem type='mount' accessmode='mapped'>
+            <source dir='/cache/ltstest'/>
+            <target dir='ltstest'/>
+        </filesystem>
+
+*mapped* is important. It uses extended attributes so it needs user_xattr on the host filesystem.
+
+Guests fstab:
+
+    ltstest /ltstest 9p   trans=virtio,version=9p2000.L,rw 0 0
+
+Do
+
+    cd /ltstest && touch a
+
+results on the host as extended attributes
+
+     # attr -l a
+     Attribute "virtfs.uid" has a 4 byte value for a
+     Attribute "virtfs.gid" has a 4 byte value for a
+     Attribute "virtfs.mode" has a 4 byte value for a
+
+For details on 9pfs see http://man.cat-v.org/plan_9/5/intro
+
+# Hot (un)plug Devices #
+
+## PCI devices ##
+
+    http://www.linux-kvm.org/page/Hotadd_pci_devices
+
+## UARTs ##
+
+    http://nairobi-embedded.org/qemu_character_devices.html
+
+## Sound ##
+Devices are not hotpluggable via libvirt
+([#1417464](https://bugzilla.redhat.com/show_bug.cgi?id=1417464)) but
+via QMP monitor:
+
+        qemu-monitor-command <vm> '{ "execute": "device_add",  "arguments": { "driver": "ES1370", "id": "snd1" }}'
+		qemu-monitor-command <vm> '{ "execute": "device_del",  "arguments": { "id": "snd1" }}
+
+        qemu-monitor-command <vm> '{ "execute": "device_add",  "arguments": { "driver": "AC97", "id": "snd2" }}'
+		qemu-monitor-command <vm> '{ "execute": "device_del",  "arguments": { "id": "snd2" }}
+
+[More details on QMP commands](https://git.qemu.org/?p=qemu.git;a=blob;f=qapi-schema.json)
+
+# Misc #
+
+* List all devices:
+
+        qemu-system-x86_64 -device ?

gbp.conf:2017 revamp
diff --git a/projects/git-buildpackage/gbp.conf b/projects/git-buildpackage/gbp.conf
index b959f77..bef74e4 100644
--- a/projects/git-buildpackage/gbp.conf
+++ b/projects/git-buildpackage/gbp.conf
@@ -4,6 +4,30 @@ sign-tags = True
 keyid = 0xB999CDB58C8DDBD2
 # use pristine tar by default
 pristine-tar = True
+dist = DEP14
+
+## The gbp commands ##
+[buildpackage]
+# Automatically push to remote repo after tagging a new release
+posttag = /var/scratch/debian/git-buildpackage/git-buildpackage/examples/gbp-posttag-push -u
+# Setup tmpfs for pbuilder
+prebuild = /home/agx/bin/tmpfs-build
+# Run Lintian after a succesful build
+postbuild = lintian $GBP_CHANGES_FILE
+# Build command
+#builder = dpkg-buildpackage -i -I -uc -us
+# Clean command
+cleaner = /bin/true
+pbuilder = True
+pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
+
+[import-orig]
+# Automatically forward the changelog after importing a new upstream version
+postimport = gbp dch -S -a --debian-branch=$GBP_BRANCH && git commit --amend -C@{0} debian/changelog
+import-msg = New upstream version %(version)s
+interactive = False
+# Don't bother merging the upstream branch, we know how the result should look like:
+merge-mode=replace
 
 [dch]
 # Parse meta tags like Closes: from commit messages
@@ -20,38 +44,36 @@ ignore-regex = (Signed-off|Acked)-by|git-svn-id:
 git-author = True
 # Merge changelog entries by maintainer
 multimaint-merge = True
-
-[buildpackage]
-# Automatically push to remote repo after tagging a new release
-posttag = /usr/share/doc/git-buildpackage/examples/gbp-posttag-push
-# Run Lintian after a succesful build
-postbuild = lintian $GBP_CHANGES_FILE
-# Build command
-builder = dpkg-buildpackage -i -I -uc -us
-# Clean command
-cleaner = /bin/true
-pbuilder = True
-pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
-
-[import-orig]
-# Automatically forward the changelog after importing a new upstream version
-#postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
-import-msg = New upstream version %(version)s
-interactive = False
+# Always ignore branch
+ignore-branch = True
 
 [import-dsc]
 sign-tags = False
 allow-unauthenticated = True
 
+[pq]
+patch-numbers = False
+
+## Remote sites we create repos at ##
 [remote-config pkg-libvirt]
-# Location of the repository
-remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
-# Template dir to passed to git-init
+remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s.git
 template-dir = /srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
 
 [remote-config calendarserver]
-# Location of the repository
-remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s
+remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s.git
+
+# Git push based 'CI'
+[remote-config cowbuilder]
+bare = False
+template-dir = /home/agx/pkgs/templates
+remote-url-pattern = ssh://cowbuilder/~/pkgs/%(pkg)s
+
+[remote-config test] 
+remote-url-pattern = ssh://honk.dyn.sigxcpu.org/~/%(pkg)s.git
+
+## Hooks can put config in here too ##
+[gbp-posttag-push]
+upload-cmd = source-only-upload
+#upload-cmd = true
+#pristine-tar = False
 
-[pq]
-patch-numbers = False

Add link to repo
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index fa5031c..cde9e9b 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -23,6 +23,7 @@
   [[file:merkur-board-flash-1st-stage-2.jpg]]
 
   Steps:
+  - Clone https://github.com/agx/merkur-board-helpers
   - Connect AVR Dragon
   - Supply 3.3V Power
   - after turning on power flush the boot loader right away

Add image
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index a671c31..fa5031c 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -48,6 +48,11 @@
 * <2017-01-15 Sun> - Eigenbau 2 with correct mac
   - Added clean before each flash so we get a fresh firmware built with the right mac
   - Reflashed first stage bootloader
+#+BEGIN_SRC shell
+       make NUM=2
+#+END_SRC
+  - Reflashed contiki
+  - pings
 #+BEGIN_EXAMPLE
        # Eigenbau 2
        $ ping6  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:642f
@@ -58,17 +63,19 @@
        1 packets transmitted, 1 received, 0% packet loss, time 0ms
        rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms
 #+END_EXAMPLE
-   - Flashed climate2 on 4 and attached DHT21
+   - Flashed first stage bootloader with correct mac and climate2 contiki on 4 and attached DHT22
 
-     | Pin DHT21 | PIN Merkur-board |
+     | Pin DHT22 | PIN Merkur-board |
      |-----------+------------------|
      |         1 | +3.3V            |
      |         2 | D3               |
      |         3 | N/C              |
      |         4 | GND              | 
 
-     (Pins on DHT21 left to right)
+     (Pins on DHT22 left to right)
+     [[file:./merkur-board-dht22.jpg]]
 
+   - answers coap requests
 #+BEGIN_EXAMPLE
        $ ping6 -c1  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535
        PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
diff --git a/hw/merkur-board/merkur-board-dht22.jpg b/hw/merkur-board/merkur-board-dht22.jpg
new file mode 100644
index 0000000..01ad9a5
Binary files /dev/null and b/hw/merkur-board/merkur-board-dht22.jpg differ

Number 4 lives
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 8af50cf..a671c31 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -59,6 +59,16 @@
        rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms
 #+END_EXAMPLE
    - Flashed climate2 on 4 and attached DHT21
+
+     | Pin DHT21 | PIN Merkur-board |
+     |-----------+------------------|
+     |         1 | +3.3V            |
+     |         2 | D3               |
+     |         3 | N/C              |
+     |         4 | GND              | 
+
+     (Pins on DHT21 left to right)
+
 #+BEGIN_EXAMPLE
        $ ping6 -c1  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535
        PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes

Number 4 lives
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 79d2a1d..8af50cf 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -9,7 +9,7 @@
 | Eigenbau 1                 | 00:21:2e:ff:ff:00:66:59 |                          | ?                                        | ?                      | ?                      |
 | Eigenbau 2                 | 00:21:2e:ff:ff:00:64:2f |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
 | Eigenbau 3                 | 00:21:2e:ff:ff:00:67:1e |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 4                 | 00:21:2e:ff:ff:00:65:35 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | climate2               | 2nd stage flash worked |
+| Eigenbau 4                 | 00:21:2e:ff:ff:00:65:35 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | climate2               | ok                     |
 | Eigenbau 5                 | 00:21:2e:ff:ff:00:66:48 |                          |                                          |                        | 2nd stage flash worked |
 | Eigenbau 6                 | 00:21:2e:ff:ff:00:64:c4 |                          |                                          |                        | 2nd stage flash worked |
 | Eigenbau 7                 | 00:21:2e:ff:ff:00:66:76 |                          |                                          |                        | 2nd stage flash worked |

Further progress
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 6477418..79d2a1d 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -1,31 +1,42 @@
 * Current Merkur Board based 6lopan devices
 
 
-| Device                        | eui64 (should)          | eui64 (actual)      | LL Address               | Firmware                                 | Type                   | State                  |
-|-------------------------------+-------------------------+---------------------+--------------------------+------------------------------------------+------------------------+------------------------|
-| OSDomotics gelb/weiße Antenne | 00:21:2e:ff:ff:00:34:7c | -                   | fe80::221:2eff:ff00:347c | f87c6fd158a964b969341eadfa974377d349b51d | arduino-plantobserving | ok                     |
-| OSDomotics weiße Ante         | 00:21:2e:ff:ff:00:33:04 | -                   |                          | f87c6fd158a964b969341eadfa974377d349b51d | rpl-border-router      | ok                     |
-| OSDomotics Carsten            |                         |                     | fe80::221:2eff:ff00:33df | ?                                        | ?                      | ?                      |
-| Eigenbau 1                    | 00:21:2e:ff:ff:00:66:59 |                     |                          | ?                                        | ?                      | ?                      |
-| Eigenbau 2                    | 00:21:2e:ff:ff:00:64:2f | 0-50-56-ff-ff-3-4-5 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
-| Eigenbau 3                    | 00:21:2e:ff:ff:00:67:1e |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 4                    | 00:21:2e:ff:ff:00:65:35 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 5                    | 00:21:2e:ff:ff:00:66:48 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 6                    | 00:21:2e:ff:ff:00:64:c4 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 7                    | 00:21:2e:ff:ff:00:66:76 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 8                    | 00:21:2e:ff:ff:00:67:01 |                     |                          |                                          |                        | defekt                 |
+| Device                     | eui64 (should)          | LL Address               | Firmware                                 | Type                   | State                  |
+|----------------------------+-------------------------+--------------------------+------------------------------------------+------------------------+------------------------|
+| OSDomotics gelb Antenne    | 00:21:2e:ff:ff:00:34:7c | fe80::221:2eff:ff00:347c | f87c6fd158a964b969341eadfa974377d349b51d | arduino-plantobserving | ok                     |
+| OSDomotics gelb/weiße Ant. | 00:21:2e:ff:ff:00:33:04 |                          | f87c6fd158a964b969341eadfa974377d349b51d | rpl-border-router      | ok                     |
+| OSDomotics Carsten         |                         | fe80::221:2eff:ff00:33df | ?                                        | ?                      | ?                      |
+| Eigenbau 1                 | 00:21:2e:ff:ff:00:66:59 |                          | ?                                        | ?                      | ?                      |
+| Eigenbau 2                 | 00:21:2e:ff:ff:00:64:2f |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
+| Eigenbau 3                 | 00:21:2e:ff:ff:00:67:1e |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 4                 | 00:21:2e:ff:ff:00:65:35 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | climate2               | 2nd stage flash worked |
+| Eigenbau 5                 | 00:21:2e:ff:ff:00:66:48 |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 6                 | 00:21:2e:ff:ff:00:64:c4 |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 7                 | 00:21:2e:ff:ff:00:66:76 |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 8                 | 00:21:2e:ff:ff:00:67:01 |                          |                                          |                        | defekt                 |
 
 * <2016-11-12 Sa> - Solder Merkur Boards 
   as of https://github.com/tijuca/lowpan-pcb-designs in Fr
 * <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
   Several boards won't accept a second stage bootloader afterwards, reason yet unknown
+  [[file:merkur-board-flash-1st-stage-1.jpg]]
+  [[file:merkur-board-flash-1st-stage-2.jpg]]
+
+  Steps:
+  - Connect AVR Dragon
+  - Supply 3.3V Power
+  - after turning on power flush the boot loader right away
+#+BEGIN_SRC shell
+   make NUM=2
+#+END_SRC
+  
 * <2016-12-11 Sun> - Eigenbau 2 pingable
     - We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
     - flash new Contiki (as of 0812b89) since f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
     - set the channel back to 26 as in f87c6f, defaults to 25 otherwise
     - slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
     - ping
-
+#+BEGIN_EXAMPLE
         $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
         PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
         64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
@@ -33,7 +44,49 @@
         --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
         1 packets transmitted, 1 received, 0% packet loss, time 0ms
        rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+#+END_EXAMPLE
+* <2017-01-15 Sun> - Eigenbau 2 with correct mac
+  - Added clean before each flash so we get a fresh firmware built with the right mac
+  - Reflashed first stage bootloader
+#+BEGIN_EXAMPLE
+       # Eigenbau 2
+       $ ping6  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:642f
+       PING 2001:db8:c001:f00d:221:2eff:ff00:642f(2001:db8:c001:f00d:221:2eff:ff00:642f) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+       64 bytes from 2001:db8:c001:f00d:221:2eff:ff00:642f: icmp_seq=1 ttl=63 time=131 ms
+
+       --- 2001:db8:c001:f00d:221:2eff:ff00:642f ping statistics ---
+       1 packets transmitted, 1 received, 0% packet loss, time 0ms
+       rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms
+#+END_EXAMPLE
+   - Flashed climate2 on 4 and attached DHT21
+#+BEGIN_EXAMPLE
+       $ ping6 -c1  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535
+       PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+       64 bytes from 2001:db8:c001:f00d:221:2eff:ff00:6535: icmp_seq=1 ttl=63 time=146 ms
+
+       --- 2001:db8:c001:f00d:221:2eff:ff00:6535 ping statistics ---
+       1 packets transmitted, 1 received, 0% packet loss, time 0ms
+       rtt min/avg/max/mdev = 146.315/146.315/146.315/0.000 ms
+
+       $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:6535]/.well-known/core
+       v:1 t:CON c:GET i:fad7 {} [ ]
+       </.well-known/core>;ct=40,</s/hum>;title="Humidity DHTxx";rt="huv:1 t:CON c:GET i:fad8 {} [ ]
+       midity %",</s/temp>;title="Temperature DHTxx";rt="temperature c"v:1 t:CON c:GET i:fad9 {} [ ]
+       ,</info>;title="Info";rt="text",</a/leds>;title="LEDs: ?color=r|v:1 t:CON c:GET i:fada {} [ ]
+       g|b, POST/PUT mode=on|off";rt="Control",</s/battery>;title="Battv:1 t:CON c:GET i:fadb {} [ ]
+       ery status";rt="Battery"
+
+       $./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:6535]/s/hum
+       v:1 t:CON c:GET i:5744 {} [ ]
+       24.60
+       ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:6535]/s/temp
+       v:1 t:CON c:GET i:bbd5 {} [ ]
+       22.90
+#+END_EXAMPLE
 
-* TODOs
-    - [ ] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+* Further TODOs
+  - [X] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+  - [X] add antenna
+  - [X] add temp sensor
+  - [X] flash temp firmware
 
diff --git a/hw/merkur-board/merkur-board-flash-1st-stage-1.jpg b/hw/merkur-board/merkur-board-flash-1st-stage-1.jpg
new file mode 100644
index 0000000..f868e9b
Binary files /dev/null and b/hw/merkur-board/merkur-board-flash-1st-stage-1.jpg differ
diff --git a/hw/merkur-board/merkur-board-flash-1st-stage-2.jpg b/hw/merkur-board/merkur-board-flash-1st-stage-2.jpg
new file mode 100644
index 0000000..53a8ccd
Binary files /dev/null and b/hw/merkur-board/merkur-board-flash-1st-stage-2.jpg differ

Use https URLs for clones
diff --git a/templates/honk_git b/templates/honk_git
index 0968a03..90bd7b2 100644
--- a/templates/honk_git
+++ b/templates/honk_git
@@ -1,6 +1,6 @@
 ### Source Code
 The source code is available via:
 
-    git clone git://honk.sigxcpu.org/git/<TMPL_VAR repo>.git
+    git clone https://git.sigxcpu.org/cgit/<TMPL_VAR repo>
 
 and can be browsed [here](https://git.sigxcpu.org/cgit/<TMPL_VAR repo>).

improve readability
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 1b4ec2e..6477418 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -20,20 +20,20 @@
 * <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
   Several boards won't accept a second stage bootloader afterwards, reason yet unknown
 * <2016-12-11 Sun> - Eigenbau 2 pingable
-**  We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
-** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
-** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
-** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
-** ping
+    - We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
+    - flash new Contiki (as of 0812b89) since f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
+    - set the channel back to 26 as in f87c6f, defaults to 25 otherwise
+    - slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
+    - ping
 
-    $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
-    PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
-    64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
+        $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
+        PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+        64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
     
-    --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
-    1 packets transmitted, 1 received, 0% packet loss, time 0ms
-    rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+        --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
+        1 packets transmitted, 1 received, 0% packet loss, time 0ms
+       rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
 
-* TODO
-** flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+* TODOs
+    - [ ] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
 

Update
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index e1ac4f4..1b4ec2e 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -20,6 +20,7 @@
 * <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
   Several boards won't accept a second stage bootloader afterwards, reason yet unknown
 * <2016-12-11 Sun> - Eigenbau 2 pingable
+**  We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
 ** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
 ** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
 ** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
@@ -34,5 +35,5 @@
     rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
 
 * TODO
-** flash bootloader again, current contiki doesn't recognize the stored MAC (or we didn't store it correctly)
+** flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
 

merkur board brain dump
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
new file mode 100644
index 0000000..e1ac4f4
--- /dev/null
+++ b/hw/merkur-board/macs.org
@@ -0,0 +1,38 @@
+* Current Merkur Board based 6lopan devices
+
+
+| Device                        | eui64 (should)          | eui64 (actual)      | LL Address               | Firmware                                 | Type                   | State                  |
+|-------------------------------+-------------------------+---------------------+--------------------------+------------------------------------------+------------------------+------------------------|
+| OSDomotics gelb/weiße Antenne | 00:21:2e:ff:ff:00:34:7c | -                   | fe80::221:2eff:ff00:347c | f87c6fd158a964b969341eadfa974377d349b51d | arduino-plantobserving | ok                     |
+| OSDomotics weiße Ante         | 00:21:2e:ff:ff:00:33:04 | -                   |                          | f87c6fd158a964b969341eadfa974377d349b51d | rpl-border-router      | ok                     |
+| OSDomotics Carsten            |                         |                     | fe80::221:2eff:ff00:33df | ?                                        | ?                      | ?                      |
+| Eigenbau 1                    | 00:21:2e:ff:ff:00:66:59 |                     |                          | ?                                        | ?                      | ?                      |
+| Eigenbau 2                    | 00:21:2e:ff:ff:00:64:2f | 0-50-56-ff-ff-3-4-5 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
+| Eigenbau 3                    | 00:21:2e:ff:ff:00:67:1e |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 4                    | 00:21:2e:ff:ff:00:65:35 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 5                    | 00:21:2e:ff:ff:00:66:48 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 6                    | 00:21:2e:ff:ff:00:64:c4 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 7                    | 00:21:2e:ff:ff:00:66:76 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 8                    | 00:21:2e:ff:ff:00:67:01 |                     |                          |                                          |                        | defekt                 |
+
+* <2016-11-12 Sa> - Solder Merkur Boards 
+  as of https://github.com/tijuca/lowpan-pcb-designs in Fr
+* <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
+  Several boards won't accept a second stage bootloader afterwards, reason yet unknown
+* <2016-12-11 Sun> - Eigenbau 2 pingable
+** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
+** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
+** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
+** ping
+
+    $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
+    PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+    64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
+    
+    --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
+    1 packets transmitted, 1 received, 0% packet loss, time 0ms
+    rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+
+* TODO
+** flash bootloader again, current contiki doesn't recognize the stored MAC (or we didn't store it correctly)
+

G_DEBUG_MESSAGES
diff --git a/development/debugging.mdwn b/development/debugging.mdwn
index feef8b5..1b0369a 100644
--- a/development/debugging.mdwn
+++ b/development/debugging.mdwn
@@ -75,6 +75,14 @@ To abort on the first encountered glib/GTK+ warning use:
 
     <program> --g-fatal-warnings
 
+## Printing Glib messages
+
+Print all messages:
+
+    G_MESSAGES_DEBUG=all <program> 
+
+See the [Glib manual][] for details.
+
 # Other tools
 * valgrind
 * strace,  ltrace
@@ -90,3 +98,4 @@ And when debugging GTK+ related problems:
 
     aptitude install libglib2.0-0-dbg libgnutls26-dbg libgtk2.0-0-dbg libpcre3-dbg vim-syntax-gtk gtkparasite
 
+[Glib manual]: https://developer.gnome.org/glib/stable/glib-running.html

Fix links to cgit
diff --git a/templates/honk_git b/templates/honk_git
index c6c46cd..0968a03 100644
--- a/templates/honk_git
+++ b/templates/honk_git
@@ -3,4 +3,4 @@ The source code is available via:
 
     git clone git://honk.sigxcpu.org/git/<TMPL_VAR repo>.git
 
-and can be browsed [here](https://honk.sigxcpu.org/gitweb/?p=<TMPL_VAR repo>.git).
+and can be browsed [here](https://git.sigxcpu.org/cgit/<TMPL_VAR repo>).

Add kopano talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 8890469..2aa9257 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,6 +1,8 @@
 ### Talks / BoFs
 
-[GBP skills exchange](https://debconf16.debconf.org/talks/132/) at Debconf 16, Cape Town, South Africa July 2016
+[The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands Octover 2016
+
+GBP skills exchange at [Debconf 16](https://debconf16.debconf.org/talks/132/), Cape Town, South Africa July 2016
 
 [Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
 

Add gbp skills exchange
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 77e044e..8890469 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,4 +1,6 @@
-### Talks
+### Talks / BoFs
+
+[GBP skills exchange](https://debconf16.debconf.org/talks/132/) at Debconf 16, Cape Town, South Africa July 2016
 
 [Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
 
@@ -37,9 +39,9 @@ at [Debconf 9](https://penta.debconf.org/dc9_schedule/events/444.en.html), Cáce
 
 Guido Günther und Matthias Schmitz: [Festplattenüberwachung mit den Smartmontools](http://www.linuxtechnicalreview.de/Vorschau/%28show%29/Themen/Storage-und-Backup/Festplattenueberwachung-mit-den-Smartmontools), Linux Technical Review 03/2007, pp. 88
 
-M. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical Investigations of Complex Nano-Systems](http://www.fz-juelich.de/nic-series/volume20/nielaba.pdf), NIC Symposium 2004, Preoceedings, pp. 291
+M\. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical Investigations of Complex Nano-Systems](http://www.fz-juelich.de/nic-series/volume20/nielaba.pdf), NIC Symposium 2004, Preoceedings, pp. 291
 
-M. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical studies of collective effects in nano-systems](http://books.google.com/books?id=_cYAQ4fp0FoC&pg=PA139&lpg=PA139&dq=Numerical+Studies+of+collective+effects+in+nano+systems+nielaba&source=bl&ots=ITSSiK_EGE&sig=mVVmHuj3J8psVc2be38s__hrwl8&hl=en&ei=mBkVTJbKMYz24AbEmdWzDA&sa=X&oi=book_result&ct=result&resnum=3&ved=0CBsQ6AEwAg), High Performance Computing in Science and Engineering 2003, pp. 193
+M\. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical studies of collective effects in nano-systems](http://books.google.com/books?id=_cYAQ4fp0FoC&pg=PA139&lpg=PA139&dq=Numerical+Studies+of+collective+effects+in+nano+systems+nielaba&source=bl&ots=ITSSiK_EGE&sig=mVVmHuj3J8psVc2be38s__hrwl8&hl=en&ei=mBkVTJbKMYz24AbEmdWzDA&sa=X&oi=book_result&ct=result&resnum=3&ved=0CBsQ6AEwAg), High Performance Computing in Science and Engineering 2003, pp. 193
 
 
 [1]: http://media.ccc.de/browse/conferences/froscon/2011/hs4_-_2011-08-20_11:15_-_the_gnome3_desktop_and_you_-_guido_gunther_-_770.html

Remove dups
diff --git a/development/apparmor-debugging.mdwn b/development/apparmor-debugging.mdwn
index 8cf1a50..d24bccf 100644
--- a/development/apparmor-debugging.mdwn
+++ b/development/apparmor-debugging.mdwn
@@ -22,18 +22,13 @@ and check for denails, turn them into "audit deny" for debugging.
 
     echo -n noquiet >/sys/module/apparmor/parameters/audit
 
+See [826218][] for details.
+
 ## Other things to watch out for
 
 * Process environments are usually cleared. So if a confined process spawns
   a subprocess that relies on environments vars this might trigger problems
 
-## Other knobs to try
-
-    echo 1 > /sys/module/apparmor/parameters/debug
-	echo -n noquiet >/sys/module/apparmor/parameters/audit
-
-See [826218][] for details.
-
 [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218
 [2]: http://wiki.apparmor.net/index.php/QuickProfileLanguage
 

Add more apparmor knobs
diff --git a/development/apparmor-debugging.mdwn b/development/apparmor-debugging.mdwn
index 8a0244f..8cf1a50 100644
--- a/development/apparmor-debugging.mdwn
+++ b/development/apparmor-debugging.mdwn
@@ -14,11 +14,27 @@ This does not track [denials][1]. So do a
 
 and check for denails, turn them into "audit deny" for debugging.
 
+## Check environment scrubbing
+
+    echo 1 > /sys/module/apparmor/parameters/debugging
+
+## Turn off deny audit quieting
+
+    echo -n noquiet >/sys/module/apparmor/parameters/audit
+
 ## Other things to watch out for
 
 * Process environments are usually cleared. So if a confined process spawns
   a subprocess that relies on environments vars this might trigger problems
 
+## Other knobs to try
+
+    echo 1 > /sys/module/apparmor/parameters/debug
+	echo -n noquiet >/sys/module/apparmor/parameters/audit
+
+See [826218][] for details.
 
 [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218
 [2]: http://wiki.apparmor.net/index.php/QuickProfileLanguage
+
+[826218]: http://bugs.debian.org/826218

Some apparmor debugging
diff --git a/development/apparmor-debugging.mdwn b/development/apparmor-debugging.mdwn
new file mode 100644
index 0000000..8a0244f
--- /dev/null
+++ b/development/apparmor-debugging.mdwn
@@ -0,0 +1,24 @@
+# Apparmor Debugging
+
+First look at the processes profile and skim the [query language][2].
+
+## Tracking denials
+
+Turn on complain mode
+
+    aa-complain <profile>
+
+This does not track [denials][1]. So do a
+
+	apparmor_parser -pq /etc/apparmor.d/the.profile.to.check
+
+and check for denails, turn them into "audit deny" for debugging.
+
+## Other things to watch out for
+
+* Process environments are usually cleared. So if a confined process spawns
+  a subprocess that relies on environments vars this might trigger problems
+
+
+[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218
+[2]: http://wiki.apparmor.net/index.php/QuickProfileLanguage

Flattr broke all links, drop them
diff --git a/templates/flattr b/templates/flattr
deleted file mode 100644
index 801986d..0000000
--- a/templates/flattr
+++ /dev/null
@@ -1,2 +0,0 @@
-<a href="https://flattr.com/thing/<TMPL_VAR thing>/<TMPL_VAR name>" target="_blank">
-<img src="/piki/common/flattr-button-compact-static-100x17.png" alt="Flattr this" title="Flattr this"/></a>

Flattr broke all links, drop them
diff --git a/donations.mdwn b/donations.mdwn
index d96d129..7852513 100644
--- a/donations.mdwn
+++ b/donations.mdwn
@@ -3,7 +3,6 @@
 In case you find any of the sigxcpu.org [[projects|index]] useful and you want
 to support my work you can do so either by:
 
-* Flattr'ing them on [flattr.com](https://flattr.com/profile/agx)
 * Hiring me as a [freelancer][1] to work on these projects.
 
 [1]: http://godiug.net
diff --git a/projects/arcboot.mdwn b/projects/arcboot.mdwn
index 11c12db..b1dd4d6 100644
--- a/projects/arcboot.mdwn
+++ b/projects/arcboot.mdwn
@@ -21,7 +21,6 @@ machine. The loader then extracts kernel and initramfs from itself into the
 correct memory locations and starts the kernel passing the address of the
 initramfs on the kernel command line.
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="arcboot"]]
 
 ### Releases
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 24b4526..fc15a45 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -20,8 +20,6 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 * *gbp-posttag-push*: posttag hook for *gbp buildpackage* to push out the necessary changes to a remote repository after a release
 * *gbp-add-patch*: Commits a patch to the current branch and uses the Path Header for the commit message, useful after *gbp pq export*.
 
-[[!template  id=flattr thing="48091" name="Git-buildpackage"]]
-
 ## Documentation
 * git-buildpackage's [official manual](http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html).
 * A possible workflow for maintaining [[development/debian packages in git]].
diff --git a/projects/krb5-auth-dialog.mdwn b/projects/krb5-auth-dialog.mdwn
index 694db2c..38ee2e0 100644
--- a/projects/krb5-auth-dialog.mdwn
+++ b/projects/krb5-auth-dialog.mdwn
@@ -19,8 +19,6 @@ Krb5-auth-dialog is a tray applet for the [GNOME](http://gnome.org) Desktop that
 * [DBus][] signals notify applications about acquired, renewed and expired tickets.
 * It supports PKinit (e.g. via SmartCard) when built against [Heimdal](http://h5l.org).
 
-[[!template  id=flattr thing="48094" name="krb5-auth-dialog"]]
-
 ## Source Code
 The source code is available and browseable via [GNOMEs GIT](http://git.gnome.org/cgit/krb5-auth-dialog/):
 
diff --git a/projects/libplanfahr.mdwn b/projects/libplanfahr.mdwn
index 497bbaa..6382488 100644
--- a/projects/libplanfahr.mdwn
+++ b/projects/libplanfahr.mdwn
@@ -15,7 +15,6 @@ LibPlanFahr is currently alpha quality software.
 * It's [introspectable][2] so it's easily usable from different languages
 * It's asynchronous
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="libplanfahr"]]
 
 ### Documentation
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index 4e5d06d..01c09eb 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -33,7 +33,6 @@ It can graph and monitor:
 ## Installation
 See the README document in the sources.
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="munin-pelletronic"]]
 
 ## Tested Versions
diff --git a/projects/network-manager-iodine.mdwn b/projects/network-manager-iodine.mdwn
index 5da685e..69645a4 100644
--- a/projects/network-manager-iodine.mdwn
+++ b/projects/network-manager-iodine.mdwn
@@ -7,8 +7,6 @@ access is firewalled but DNS traffic is still allowed.
 
 [[!toc ]]
 
-[[!template  id=flattr thing="494948" name="network-manager-iodine"]]
-
 ### Source Code
 The [source code][code] is available via:
 
diff --git a/projects/ppm.mdwn b/projects/ppm.mdwn
index 02ef8eb..100d792 100644
--- a/projects/ppm.mdwn
+++ b/projects/ppm.mdwn
@@ -42,7 +42,6 @@ bought in e.g. supermarkets or from your provider to top-up a certain amount of
 * It can check the remaining balance via USSD
 * It can top up the balance with a given code via USSD
 
-[[!template  id=flattr thing="460518" name="GNOME-Prepaid-Manager"]]
 [[!template  id=honk_git repo="ppm"]]
 
 ### Releases
diff --git a/projects/sapgui-package.mdwn b/projects/sapgui-package.mdwn
index 14ba626..ec49d48 100644
--- a/projects/sapgui-package.mdwn
+++ b/projects/sapgui-package.mdwn
@@ -12,7 +12,6 @@ for Java](ftp://ftp.sap.com/pub/sapgui/java) from the available .JAR for Linux.
 
         dpkg -i sapgui_7.20rev1_i386.deb
 
-[[!template  id=flattr thing="51815" name="sapgui-package"]]
 [[!template  id=honk_git repo="sapgui-package"]]
     
 ## Debian Package
diff --git a/projects/whatmaps.mdwn b/projects/whatmaps.mdwn
index a7043a5..ed19846 100644
--- a/projects/whatmaps.mdwn
+++ b/projects/whatmaps.mdwn
@@ -53,7 +53,6 @@ To enable automatic restarts during security updates on Debian based systems set
 
 in */etc/apt/apt.conf.d/20services*.
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="whatmaps"]]
 
 ## Notes

Document "assist" button
diff --git a/hw/sony-SVD1321X9EW.mdwn b/hw/sony-SVD1321X9EW.mdwn
index def990d..fccc668 100644
--- a/hw/sony-SVD1321X9EW.mdwn
+++ b/hw/sony-SVD1321X9EW.mdwn
@@ -44,3 +44,12 @@ Current status of hardware support on the Sony Vaio Duo 13" using Debian/Sid wit
 [3]: http://bugs.debian.org/737186
 [4]: http://bugs.debian.org/745331
 [5]: git://git.lii-enac.fr/linux-input/mtdiag.git
+
+## Installation ##
+
+Prepare a USB stick as [documented][6]. After shutting down Windows
+press the *Assist" button at the bottom side of the laptop next to the
+volume buttons. The then showing menu will allow you to boot from USB
+stick.
+
+[6]: https://www.debian.org/releases/jessie/amd64/ch04s03.html.en

Add Erlang talk add FSFE meeting Bonn
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index e5614ef..77e044e 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
+
 [Debian - 22 years and counting](http://honk.sigxcpu.org/talks/2015-09-zarafa/) at [Zarafa Tour 2015](https://www.zarafa.com/register-for-zarafa-tour-2015-the-netherlands-edition/), Woubrugge near Amsterdam, Netherlands, 2015
 
 [[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])

Make it clear that we're not there yet
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 640c24a..0a58841 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -103,6 +103,8 @@ when pinging the merkur-board from the Raspberry Pi:
     before compression (40): 6000000000283aff
 	...
 
+...but the Linux node doesn't see the replies. More to come when we have a second pi that can act as monitor.
+
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
 [2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide

Revisiting this problem after almost a year
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 76b8696..640c24a 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -7,7 +7,7 @@ some sensors. The [Merkur Board][0] is open hardware:
 
 It has digital outputs as well as digital, analog and PWM outputs and
 supports attaching Arduino Grove Modules which should make experiments
-simple.  In order to test thinks I use the
+simple.  In order to test things I use the
 [Plant Oberservation Kit][1] set.
 
 One uses USB-Serial converter to flash the device. Details on how to
@@ -63,13 +63,12 @@ breakout*][8] flashing works as expected:
 The flashed firmware uses *channel 26* and *pan_id 0xabcd* by default.  This can
 be seen on the serial output (you can use the same serial converter as for
 flashing). To read the serial console I've so far used the serial console
-window from the arduino ide since *screen* doesn't support the 14400 baud used
-by the merkur-board.
+window from the arduino ide since *screen* doesn't support the 38400 baud used
+by the merkur-board ().
 
 While I'm seeing packages looking for a RIPL router send by the merkur-board
 when using a Raspberry Pi as described in [[here|rpi6lowpan]], I can't ping the
-board on it's link local address yet. I can also verify that it detects the
-RIPL router but the device is still not reachable.
+board on it's link local address yet.
 
 So let's for now use a second merkur board as [edge-router][].
 
@@ -90,6 +89,20 @@ We can now query the moisture sensor using [libcoap]:
     $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:347c]/moisture/v
 
 
+## Some Linux, Contiki interop progress
+
+Looking into the above problem in some more detail it shows that using
+[[rpi6lowpan]] setup in [monitor mode][] we see all the packages sent
+from the merkur boards on Linux but not vice verca. If we
+[disable sleep mode][] in contiki we can receive frames from Linux
+when pinging the merkur-board from the Raspberry Pi:
+
+    Received NS from fe80::80cd:9a1:845b:4d6a to ff02::1:ff00:3304 with target addressfe80::221:2e��f:ff0N��
+    Sending NA to fe80::80cd:9a1:845b:4d6a from fe80::221:2eff:ff00:3304 with target address fe80::221:2eff:ff00:3304
+    sicslowpan output: sending packet len 80
+    before compression (40): 6000000000283aff
+	...
+
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
 [2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide
@@ -103,3 +116,5 @@ We can now query the moisture sensor using [libcoap]:
 [edge-router]: http://osdwiki.open-entry.com/doku.php/de:tutorials:contiki:merkur_board_rpl_usb_router
 [Find A5]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4
 [libcoap]: http://sourceforge.net/projects/libcoap/
+[monitor mode]: http://wpan.cakelab.org/#_sniffing
+[disable sleep mode]: https://github.com/agx/osd-contiki/commit/5ecf780a4873b6942e50964cfcb3d067b0a60cce
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index e42a623..3ec638d 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -7,7 +7,7 @@ at86rf233) so we can later use it as a e.g. border router.
 [[!img rpiradio.jpg size="x150" alt="Raspberry Pi with 802.15.4 radio"]]
 
 The default Raspberry Pi kernel used to lack support for recent
-[wpan-tools][3]. So we cross build akernel and boot it via tftp.
+[wpan-tools][3]. So we cross build a kernel and boot it via tftp.
 Newer kernels have basic support so you only need to do this if you
 want to hack on the kernel's [6LoWPAN][1] parts.
 

Note that newer Pi models don't work yet
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index f47b472..e42a623 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -6,12 +6,15 @@ at86rf233) so we can later use it as a e.g. border router.
 
 [[!img rpiradio.jpg size="x150" alt="Raspberry Pi with 802.15.4 radio"]]
 
-The default Raspberry Pi kernel lacks support for recent
-[wpan-tools][3]. So we cross build a custom
-built kernel via tftp.
-
-In the following we assume the Raspberry Pi is at IP address 192.168.1.2 and
-does DHCP during boot.
+The default Raspberry Pi kernel used to lack support for recent
+[wpan-tools][3]. So we cross build akernel and boot it via tftp.
+Newer kernels have basic support so you only need to do this if you
+want to hack on the kernel's [6LoWPAN][1] parts.
+
+In the following we assume the Raspberry Pi is at IP
+address 192.168.1.2 and does DHCP during boot. It has been tested on a
+Raspberry Pi B+, the model 2 and model 3 Pis have issues. If you get
+it working on these, let me know.
 
 This is mostly a combination of information from different sites like
 [linux-wpan][3], [openlabs][4] and [eLinux.org][5]. For details head over to

This really is only for RPI fixups
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 97c8fde..f47b472 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -153,7 +153,7 @@ vie SPI we change the DTS so it gets properly detected. This is
 readily done in my wpan-next (based on Alexanders repo) git repo which
 you can add to the *bluetooth-next* repo you alread cloned above:
 
-    $ git remote add agx git://github.com/agx/linux-wpan-next.git
+    $ git remote add agx git://github.com/agx/linux-wpan-rpi-next.git
     $ git fetch rpi-6lowpan
     $ git checkout -b rpi-6lowpan -b agx/rpi-6lowpan
 

Add notes for RPI2
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index eb0c984..97c8fde 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -102,6 +102,8 @@ Crossbuild U-Boot
     $ make rpi_defconfig
     $ make -j4 -s
 
+In case you're on a RPI2 use rpi\_2\_defconfig instead of rpi_defconfig.
+
 #### On the RPi
 Now configure the RPi to use the just built U-Boot (${PI_IP} being the
 address of your Raspberry Pi). First on copy U-Boot to the Pi:
@@ -130,6 +132,8 @@ This assumes you're using a USB-serial adapter that shows up as
     $ tftp ${fdt_addr_r} ${fdtfile}
     $ bootz ${kernel_addr_r} - ${fdt_addr_r}
 
+If you're using a rpi 2 use *bcm2836-rpi-2-b.dtb* instead of *bcm2835-rpi-b-plus.dtb*.
+
 #### Automate the boot
 Copy the above commands into a file called *boot.src* and do a
 

Fix link
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 144727c..eb0c984 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -85,11 +85,11 @@ Move the necessary files to the tftp server (${TFT_IP} being the address of your
     $ scp bluetooth-next/arch/arm/boot/zImage ${TFTP_IP}:/tftpboot/rpi.img
     $ scp bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb ${TFTP_IP}:/tftpboot/
 
-If you're using another PI model copy the corresponding device tree (dtb) file
+If you're using another PI model copy the corresponding device tree (dtb) file.
 
 ### U-Boot
 We want to boot the kernel using U-Boot so we can conveniently swap out kernels using TFTP.
-This is mostly copied from http://elinux.org/RPi_U-Boot .
+This is mostly copied from [http://elinux.org/RPi_U-Boot](http://elinux.org/RPi_U-Boot) .
 
 #### On the build host
 Crossbuild U-Boot
@@ -115,7 +115,7 @@ and on the Raspberry Pi boot it by default:
     $ poweroff
 
 #### First Boot
-(Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
+(Again mostly from  [http://elinux.org/RPi_U-Boot](http://elinux.org/RPi_U-Boot)). Attach to the serial
 console of your rpi:
 
     $ screen /dev/ttyUSB0 115200

Fix typos and elaborate a bit
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index c69f425..144727c 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -94,9 +94,9 @@ This is mostly copied from http://elinux.org/RPi_U-Boot .
 #### On the build host
 Crossbuild U-Boot
 
-    $ git clone --deth=1 git://git.denx.de/u-boot.git
+    $ git clone --depth=1 git://git.denx.de/u-boot.git
     $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
-    $ export CROSS_COMPILE=/home/agx/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
+    $ export CROSS_COMPILE=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
     $ export USE_PRIVATE_LIBGCC=yes
 	$ cd u-boot
     $ make rpi_defconfig
@@ -116,16 +116,17 @@ and on the Raspberry Pi boot it by default:
 
 #### First Boot
 (Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
-console
+console of your rpi:
 
-    $ screen /dev/ttyUSB<N> 115200
+    $ screen /dev/ttyUSB0 115200
 
-then power on the RPi and once U-Boot starts do a
+This assumes you're using a USB-serial adapter that shows up as
+*/dev/ttyUSB0*.  Then power on the RPi and once U-Boot starts do a
 
     $ setenv fdtfile bcm2835-rpi-b-plus.dtb
     $ setenv bootargs earlyprintk console=ttyAMA0 console=tty1 root=/dev/mmcblk0p2 rootwait
     $ usb start
-    $ dhcp ${kernel_addr_r} zImage
+    $ dhcp ${kernel_addr_r} rpi.img
     $ tftp ${fdt_addr_r} ${fdtfile}
     $ bootz ${kernel_addr_r} - ${fdt_addr_r}
 
@@ -142,14 +143,15 @@ happen automatically.
 Now that we can quickly change and build kernels lets move to the 6LoWPAN part.
 
 ### Configuring the kernel and patching the DTS
-In order to enable support for the at86rf233 and 802.15.14 radio we need to change
-some kernel configuration. Since the board is connected vie SPI we change the DTS
-so it gets properly detected. This is readily done in this git repo:
+In order to enable support for the at86rf233 and 802.15.14 radio we
+need to change some kernel configuration. Since the board is connected
+vie SPI we change the DTS so it gets properly detected. This is
+readily done in my wpan-next (based on Alexanders repo) git repo which
+you can add to the *bluetooth-next* repo you alread cloned above:
 
-    $ cd linux-wpan-next
     $ git remote add agx git://github.com/agx/linux-wpan-next.git
     $ git fetch rpi-6lowpan
-    $ git co -b rpi-6lowpan -b agx/rpi-6lowpan
+    $ git checkout -b rpi-6lowpan -b agx/rpi-6lowpan
 
 Now lets rebuild DTS and kernel
 

Update
diff --git a/projects/cl2vcs.mdwn b/projects/cl2vcs.mdwn
index bedf3c3..6fd3dcb 100644
--- a/projects/cl2vcs.mdwn
+++ b/projects/cl2vcs.mdwn
@@ -1,6 +1,6 @@
-[Cl2vcs](https://honk.sigxcpu.org/cl2vcs/) is a simple CGI that maps Debian changelogs back to VCS commit ids.
-
-[[!toc ]]
+[Cl2vcs](https://honk.sigxcpu.org/cl2vcs/) is a simple CGI that maps
+Debian changelogs back to VCS commit ids. It currently supports
+gitweb, cgit and the hg repo browser.
 
 ### Source Code
 The source code is available via:

Participants sound more active
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index da571f0..8e6994a 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -7,7 +7,7 @@
 * Number of Debian Bugs fixed: *2*
 * Files transferred via XMPP: *2*
 
-## Attendees
+## Participants
 * Johannes Hubertz
 * Carsten Schönert
 * Christoph Göhre

Add attendees and fix typo
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index ddf7f7f..da571f0 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -7,13 +7,20 @@
 * Number of Debian Bugs fixed: *2*
 * Files transferred via XMPP: *2*
 
-Some things that happened:
+## Attendees
+* Johannes Hubertz
+* Carsten Schönert
+* Christoph Göhre
+* Sascha Girrulat
+* [[Guido Günther|agx]]
+
+## Some things that happened
 
 * Uploaded a new version of [iptables-converter][] 0.9.8
 * Fixed icedove's RC bug [#802281][]
 * Uploaded [libvirt][] 1.2.21-rc1 to experimental
 * Finally uploaded a first version of [zarafa][] to experimental
-* Worked on improved apache suppot for [zarafa-webapp][] (not yet in
+* Worked on improved apache support for [zarafa-webapp][] (not yet in
   the archive)
 * Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
 * Work on making iptables-converter reproducible (not finished yet)

...wait there's more
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index 06021d7..ddf7f7f 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -16,6 +16,9 @@ Some things that happened:
 * Worked on improved apache suppot for [zarafa-webapp][] (not yet in
   the archive)
 * Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
+* Work on making iptables-converter reproducible (not finished yet)
+* Work on making gbp import-orig more smart on errors (not finished yet)
+
 
 [iptables-converter]: https://packages.debian.org/source/sid/iptables-converter
 [#802281]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802281

Add version
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index b1b27ff..06021d7 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -9,11 +9,12 @@
 
 Some things that happened:
 
-* Uploaded a new version of [iptables-converter][]
+* Uploaded a new version of [iptables-converter][] 0.9.8
 * Fixed icedove's RC bug [#802281][]
 * Uploaded [libvirt][] 1.2.21-rc1 to experimental
 * Finally uploaded a first version of [zarafa][] to experimental
-* Worked on improved apache suppot for [zarafa-webapp][]
+* Worked on improved apache suppot for [zarafa-webapp][] (not yet in
+  the archive)
 * Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
 
 [iptables-converter]: https://packages.debian.org/source/sid/iptables-converter

Add events
diff --git a/index.mdwn b/index.mdwn
index 550f8e3..3a1d8a9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -33,3 +33,6 @@ In case you find any of these projects useful and you want to support work on th
 * [[development/Debugging]]
 * [[development/Gerrit]]
 * [[development/Install_as_non_Root]]
+
+### Events ###
+* [[hepl|HEPL]]

Add hepl
diff --git a/hepl.mdwn b/hepl.mdwn
new file mode 100644
index 0000000..e501ba9
--- /dev/null
+++ b/hepl.mdwn
@@ -0,0 +1,11 @@
+# Hacking Erpel
+
+Hacking Erpel (short HEPL) is a currently irregular Free Software
+Hacking event happening between Bonn and Koblenz in [Erpel][].
+
+[[!map pages="hepl/* and ! hepl/*/*"]]
+
+There's a [mailing list][] too that will get announcements of upcoming HEPLs.
+
+[Erpel]: https://de.wikipedia.org/wiki/Erpel
+[mailing list]: https://lists.sigxcpu.org/mailman/listinfo/hepl
diff --git a/hepl/hepl0.mdwn b/hepl/hepl0.mdwn
new file mode 100644
index 0000000..d75492b
--- /dev/null
+++ b/hepl/hepl0.mdwn
@@ -0,0 +1,8 @@
+# HEPL0
+
+* When: 2015-07-13
+* Number of patricipants: 6
+* Number of Tofu sausages: *unknown*
+* Number of Debian Bugs fixed: *unknown*
+
+
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
new file mode 100644
index 0000000..b1b27ff
--- /dev/null
+++ b/hepl/hepl1.mdwn
@@ -0,0 +1,24 @@
+# HEPL1
+
+* When: *2015-10-31*
+* Number of patricipants: *5*
+* Bowls of Chilli Con Soja: *1*
+* Mates drank: *0*
+* Number of Debian Bugs fixed: *2*
+* Files transferred via XMPP: *2*
+
+Some things that happened:
+
+* Uploaded a new version of [iptables-converter][]
+* Fixed icedove's RC bug [#802281][]
+* Uploaded [libvirt][] 1.2.21-rc1 to experimental
+* Finally uploaded a first version of [zarafa][] to experimental
+* Worked on improved apache suppot for [zarafa-webapp][]
+* Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
+
+[iptables-converter]: https://packages.debian.org/source/sid/iptables-converter
+[#802281]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802281
+[libvirt]: https://packages.debian.org/source/experimental/libvirt
+[zarafa]: https://ftp-master.debian.org/new/zarafa_7.2.1~RC51272+dfsg1-1.html
+[zarafa-webapp]: https://github.com/tijuca/zarafa-webapp
+

Ignore emacs backup files
diff --git a/.gitignore b/.gitignore
index b84c806..a8764b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.ikiwiki
 /recentchanges
+*~

Update gbp-rpm status
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index d11db06..24b4526 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -48,7 +48,7 @@ Here's my current [[gbp.conf]].
 ## Related Tools
 * [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available.
 * [Chef Cookbook for gbp][1]
-* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Aim is to integrate this back into gbp.
+* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Large parts merged into gbp already.
 
 ## Todo
 * templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])

Add missing source
diff --git a/development/install_as_non_root.mdwn b/development/install_as_non_root.mdwn
index eb33096..d991f9d 100644
--- a/development/install_as_non_root.mdwn
+++ b/development/install_as_non_root.mdwn
@@ -24,6 +24,8 @@ the libraries into a location where other tools can setp on it
 Use bundler to pull Gems from [rubygems.org](http://rubygems.org). The *Gemfile*
 describes what you want to pull in:
 
+    source 'https://rubygems.org'
+
     group :development, :test do
       gem 'puppetlabs_spec_helper',  :require => false
       gem 'puppet-lint',             :require => false

Update status of IIO and WLAN
diff --git a/hw/sony-SVD1321X9EW.mdwn b/hw/sony-SVD1321X9EW.mdwn
index b4a7d3e..def990d 100644
--- a/hw/sony-SVD1321X9EW.mdwn
+++ b/hw/sony-SVD1321X9EW.mdwn
@@ -24,19 +24,18 @@ Current status of hardware support on the Sony Vaio Duo 13" using Debian/Sid wit
     * usb 12d1:1573
     * needs recent MM and libqmi-glib (checked git HEAD at 2014-01-26)
     * ~~[Debian Bug][3]~~
-* WLAN works somewhat
+* WLAN *works*
     * Broadcom BCM4324
     * slow
     * needs CONFIG_BRCMFMAC, CONFIG_BRCMFMAC_SDIO
     * ~~[Debian Bug][1]~~
-    * Works with ifup/down, doesn't work with NM due to different interfaces
-      being used. Needs further investigation.
+    * Works with Network-manager and ifup/down as of Linux 4.1.0
 * NFC not tested yet
 * GPS not detected yet
-* Rotation-Sensor/Accelerometer doet not work
-    * detecte as iio device (/sys/bus/iio/devices but not HID events
-      (missing firmware?)
+* Rotation-Sensor/Accelerometer *works*
+    * detected as iio device (/sys/bus/iio/devices
     * needs CONFIG_I2C_HID,CONFIG_I2C_DESIGNWARE_PLATFORM
+	* Handled via iio-sensor-proxy
 * Bluetooth not tested yet
 * SD-Card slot works
 

Add zarafa tour talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index ddc1dd2..e5614ef 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[Debian - 22 years and counting](http://honk.sigxcpu.org/talks/2015-09-zarafa/) at [Zarafa Tour 2015](https://www.zarafa.com/register-for-zarafa-tour-2015-the-netherlands-edition/), Woubrugge near Amsterdam, Netherlands, 2015
+
 [[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])
 
 [[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015

Link video too
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index d226207..ddc1dd2 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,6 +1,6 @@
 ### Talks
 
-[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015
+[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])
 
 [[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015
 
@@ -43,3 +43,4 @@ M. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. S
 [3]: http://wiki.debian.org/Groupware#Meeting
 [4]: http://blogs.fsfe.org/fellowship-interviews/?p=547
 [5]: http://twit.tv/show/floss-weekly/213
+[6]: http://ftp.acc.umu.se/pub/debian-meetings/2015/debconf15/Gitbuildpackage_BoF.webm

Add Debconf BoF
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index ad35933..d226207 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015
+
 [[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015
 
 [[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2014

Using merkur-board with tunslip6
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index d10b6d4..76b8696 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -19,6 +19,7 @@ Once flushed the board can be run on [battery power][3].
 * [Details on the different pinouts][4]
 * [Details on how to flash the device][5] with avrdude
 * The plant moisture sensor connects to [A5][6]
+* [Find A5][] on the Grove Board
 
 Compiling works like
 
@@ -70,6 +71,25 @@ when using a Raspberry Pi as described in [[here|rpi6lowpan]], I can't ping the
 board on it's link local address yet. I can also verify that it detects the
 RIPL router but the device is still not reachable.
 
+So let's for now use a second merkur board as [edge-router][].
+
+    $ sudo ./tunslip6 -s /dev/ttyUSB4 -B 38400 2001:DB8:c001:f00d::1/64
+    $ ping6 -c 1 2001:db8:c001:f00d:221:2eff:ff00:347c
+    PING 2001:db8:c001:f00d:221:2eff:ff00:347c(2001:db8:c001:f00d:221:2eff:ff00:347c) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+    64 bytes from 2001:db8:c001:f00d:221:2eff:ff00:347c: icmp_seq=1 ttl=63 time=201 ms
+    --- 2001:db8:c001:f00d:221:2eff:ff00:347c ping statistics ---
+    1 packets transmitted, 1 received, 0% packet loss, time 0ms
+    rtt min/avg/max/mdev = 201.620/201.620/201.620/0.000 ms
+    $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:347c]/.well-known/core
+    v:1 t:CON c:GET i:8ecd {} [ ]
+    </.well-known/core>;ct=40,</moisture/v>;title="Moisture voltage"v:1 t:CON c:GET i:8ece {} [ ]
+    ;rt=UCUM:"V";ct="0 5"
+
+We can now query the moisture sensor using [libcoap]:
+
+    $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:347c]/moisture/v
+
+
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
 [2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide
@@ -80,4 +100,6 @@ RIPL router but the device is still not reachable.
 [7]: http://www.meetup.com/IoT-Vienna/events/181968432/
 [Prolific Pinout]: https://jethomson.files.wordpress.com/2010/02/ca-42_dku-5_pinout.jpg
 [8]: http://www.open-entry.com/coxcoon/de/Zubehoer/FTDI-Basic-Breakout-3-3V.html
-
+[edge-router]: http://osdwiki.open-entry.com/doku.php/de:tutorials:contiki:merkur_board_rpl_usb_router
+[Find A5]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4
+[libcoap]: http://sourceforge.net/projects/libcoap/

Some progress on the merkur-board
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 93bb27d..d10b6d4 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -27,9 +27,9 @@ Compiling works like
     cd ./osd-contiki/examples/osd/arduino-plantobserving
     ./run.sh
 
-The build software can then be flushed to the device.  Note that it used
-/dev/ttyUSB0 by default. This needs to be adjusted. But currently when trying
-the flash the merkur-board I'm only seeing
+The build software can then be flushed to the device.  Note that it uses
+/dev/ttyUSB0 by default. This needs to be adjusted. When trying the flash the
+merkur-board with the usual USB-serial converter I see:
 
 	$ sudo apt-get install avrdude
 	$ cd osd-contiki/examples/osd/arduino-plantobserving
@@ -54,8 +54,21 @@ the flash the merkur-board I'm only seeing
 	Makefile:88: recipe for target 'flash' failed
 	make: *** [flash] Error 1
 
-even if I [ground the reset pin][7] (Pin 3).
+even if I [ground the reset pin][7] (Pin 3). However if I use a [*FTDI basic
+breakout*][8] flashing works as expected:
 
+	....
+
+The flashed firmware uses *channel 26* and *pan_id 0xabcd* by default.  This can
+be seen on the serial output (you can use the same serial converter as for
+flashing). To read the serial console I've so far used the serial console
+window from the arduino ide since *screen* doesn't support the 14400 baud used
+by the merkur-board.
+
+While I'm seeing packages looking for a RIPL router send by the merkur-board
+when using a Raspberry Pi as described in [[here|rpi6lowpan]], I can't ping the
+board on it's link local address yet. I can also verify that it detects the
+RIPL router but the device is still not reachable.
 
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
@@ -66,3 +79,5 @@ even if I [ground the reset pin][7] (Pin 3).
 [6]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4#steckerbelegung
 [7]: http://www.meetup.com/IoT-Vienna/events/181968432/
 [Prolific Pinout]: https://jethomson.files.wordpress.com/2010/02/ca-42_dku-5_pinout.jpg
+[8]: http://www.open-entry.com/coxcoon/de/Zubehoer/FTDI-Basic-Breakout-3-3V.html
+

We also need to "ifconfig lowpan0 up"
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index f6e0355..c69f425 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -179,17 +179,18 @@ Now we have all the tools:
 
 Make sure there's no ifplugd that brings the interface up. Kill it,
 if it's there. Then make sure the interface is down, set a pan_id and
-and add create the 6LoWPAN interfade:
+and add create the 6LoWPAN interface:
 
     $ kill $(ps awux | grep "[i]fplugd.*wpan0" | awk '{print $2}')
     $ ifconfig wpan0 | grep -qs UP && ifconfig wpan0 down
     $ src/iwpan dev wpan0 set pan_id 0xbeef
     $ ip link add link wpan0 name lowpan0 type lowpan
     $ ifconfig wpan0 up
+    $ ifconfig lowpan0 up
 
 You can now (hopefully) ping the other device:
 
-    $ ping6 -I lowpan0 fe80::f836:9287:905c:a684
+    $ ping6 fe80::f836:9287:905c:a684%lowpan0
     PING fe80::f836:9287:905c:a684(fe80::f836:9287:905c:a684) from fe80::cb23:b779:742d:4fd2 lowpan0: 56 data bytes
     64 bytes from fe80::f836:9287:905c:a684: icmp_seq=4 ttl=64 time=16.6 ms
     64 bytes from fe80::f836:9287:905c:a684: icmp_seq=11 ttl=64 time=30.6 ms

Duplication
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 00c4048..93bb27d 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -27,14 +27,11 @@ Compiling works like
     cd ./osd-contiki/examples/osd/arduino-plantobserving
     ./run.sh
 
-The build software can then be flushed to the device
+The build software can then be flushed to the device.  Note that it used
+/dev/ttyUSB0 by default. This needs to be adjusted. But currently when trying
+the flash the merkur-board I'm only seeing
 
-    sudo ./flash.sh
-
-Not that it used /dev/ttyUSB0 by default. This needs to be adjusted.
-Currently when trying the flash the merkur-board I'm only seeing
-
-    $ sudo apt-get install avrdude
+	$ sudo apt-get install avrdude
 	$ cd osd-contiki/examples/osd/arduino-plantobserving
 	$ ./flash.sh /dev/ttyUSB4
 	INFO: compiling with CoAP-13

Add compilation notes
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index a9f2853..00c4048 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -20,8 +20,21 @@ Once flushed the board can be run on [battery power][3].
 * [Details on how to flash the device][5] with avrdude
 * The plant moisture sensor connects to [A5][6]
 
-But currently when trying the flash the merkur-board I'm only seeing
+Compiling works like
 
+    apt-get install avr-libc binutils-avr gcc-avr gdb-avr simulavr avrdude doxygen
+    git clone https://github.com/osdomotics/osd-contiki
+    cd ./osd-contiki/examples/osd/arduino-plantobserving
+    ./run.sh
+
+The build software can then be flushed to the device
+
+    sudo ./flash.sh
+
+Not that it used /dev/ttyUSB0 by default. This needs to be adjusted.
+Currently when trying the flash the merkur-board I'm only seeing
+
+    $ sudo apt-get install avrdude
 	$ cd osd-contiki/examples/osd/arduino-plantobserving
 	$ ./flash.sh /dev/ttyUSB4
 	INFO: compiling with CoAP-13

Add image
diff --git a/hw/merkur-board/merkur-board.jpg b/hw/merkur-board/merkur-board.jpg
new file mode 100644
index 0000000..8523db6
Binary files /dev/null and b/hw/merkur-board/merkur-board.jpg differ

Add some merkur-board docs
even though it doesn't flash contiki yet.
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
new file mode 100644
index 0000000..a9f2853
--- /dev/null
+++ b/hw/merkur-board.mdwn
@@ -0,0 +1,58 @@
+# 6LowPAN with the Merkur-Board
+
+In for the [[rpi6lowpan]] to be actually usefull it needs to talk to
+some sensors. The [Merkur Board][0] is open hardware:
+
+[[!img merkur-board.jpg size="x150" alt="Merkur-Board"]]
+
+It has digital outputs as well as digital, analog and PWM outputs and
+supports attaching Arduino Grove Modules which should make experiments
+simple.  In order to test thinks I use the
+[Plant Oberservation Kit][1] set.
+
+One uses USB-Serial converter to flash the device. Details on how to
+connect it are [here][2]. Once the converter is attached to the board
+it's LED starts to blink (in my case 4 times short, one time long).
+
+Once flushed the board can be run on [battery power][3].
+
+* [Details on the different pinouts][4]
+* [Details on how to flash the device][5] with avrdude
+* The plant moisture sensor connects to [A5][6]
+
+But currently when trying the flash the merkur-board I'm only seeing
+
+	$ cd osd-contiki/examples/osd/arduino-plantobserving
+	$ ./flash.sh /dev/ttyUSB4
+	INFO: compiling with CoAP-13
+	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB4 -b57600 -e -U \
+    flash:w:arduino-example.osd-merkur.hex:a -U \
+    eeprom:w:arduino-example.osd-merkur.eep:a
+	avrdude: