diff -Nru nurpawiki-1.2.3/debian/changelog nurpawiki-1.2.3/debian/changelog
--- nurpawiki-1.2.3/debian/changelog	2016-07-10 10:54:32.000000000 +0000
+++ nurpawiki-1.2.3/debian/changelog	2016-09-03 13:15:48.000000000 +0000
@@ -1,14 +1,18 @@
-nurpawiki (1.2.3-9build2) yakkety; urgency=medium
+nurpawiki (1.2.3-10build1) yakkety; urgency=medium
 
-  * No-change rebuild against libocsigenserver-ocaml-h1082
+  * Rebuild for ocaml ABIs.
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 10 Jul 2016 10:54:32 +0000
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 03 Sep 2016 15:15:48 +0200
 
-nurpawiki (1.2.3-9build1) xenial; urgency=medium
+nurpawiki (1.2.3-10) unstable; urgency=medium
 
-  * Rebuild for new OCaml ABIs.
+  [ Mehdi Dogguy ]
+  * Update watch file
 
- -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Feb 2016 12:04:09 +0000
+  [ Stéphane Glondu ]
+  * Add camlp4 to Build-Depends
+
+ -- Stéphane Glondu <glondu@debian.org>  Tue, 23 Aug 2016 11:54:51 +0200
 
 nurpawiki (1.2.3-9) unstable; urgency=medium
 
diff -Nru nurpawiki-1.2.3/debian/control nurpawiki-1.2.3/debian/control
--- nurpawiki-1.2.3/debian/control	2016-07-10 10:54:32.000000000 +0000
+++ nurpawiki-1.2.3/debian/control	2016-08-23 09:53:55.000000000 +0000
@@ -1,7 +1,6 @@
 Source: nurpawiki
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Stéphane Glondu <glondu@debian.org>
 Build-Depends:
  debhelper (>= 9),
@@ -10,6 +9,7 @@
  libcalendar-ocaml-dev (>= 2.01.1-6~),
  libextlib-ocaml-dev (>= 1.5.1-5~),
  libpostgresql-ocaml-dev (>= 1.12.1-2~),
+ camlp4,
  ocaml-nox (>= 3.11.1-3~)
 Standards-Version: 3.9.7
 Section: web
diff -Nru nurpawiki-1.2.3/debian/watch nurpawiki-1.2.3/debian/watch
--- nurpawiki-1.2.3/debian/watch	2016-02-07 13:03:48.000000000 +0000
+++ nurpawiki-1.2.3/debian/watch	2016-08-23 09:53:55.000000000 +0000
@@ -1,5 +1,4 @@
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
-downloadurlmangle=s%.*/([^/]*)/downloads/detail\?name=([^=&]*).*%http://$1.googlecode.com/files/$2%,filenamemangle=s/.*name=([^&]+).*/$1/ \
-http://code.google.com/p/nurpawiki/downloads/list?can=1 .*=nurpawiki-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|zip).*
-# Bart Martens <bartm@debian.org>  Sat, 19 Jan 2013 13:20:56 +0000
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%<project>-$1.tar.gz%" \
+  https://github.com/nurpax/nurpawiki/tags \
+  (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate