diff -Nru golang-github-jonboulle-clockwork-0.0~git20141217/debian/changelog golang-github-jonboulle-clockwork-0.0~git20141217/debian/changelog
--- golang-github-jonboulle-clockwork-0.0~git20141217/debian/changelog	2016-05-10 02:25:56.000000000 +0000
+++ golang-github-jonboulle-clockwork-0.0~git20141217/debian/changelog	2016-06-11 22:24:04.000000000 +0000
@@ -1,3 +1,9 @@
+golang-github-jonboulle-clockwork (0.0~git20141217-3+rpi1) stretch-staging; urgency=medium
+
+  * Add conflics on golang-clockwork-dev.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 11 Jun 2016 22:23:02 +0000
+
 golang-github-jonboulle-clockwork (0.0~git20141217-3) unstable; urgency=medium
 
   * Rename binary package in line with new naming policy.
diff -Nru golang-github-jonboulle-clockwork-0.0~git20141217/debian/control golang-github-jonboulle-clockwork-0.0~git20141217/debian/control
--- golang-github-jonboulle-clockwork-0.0~git20141217/debian/control	2016-05-10 02:22:33.000000000 +0000
+++ golang-github-jonboulle-clockwork-0.0~git20141217/debian/control	2016-06-11 22:24:36.000000000 +0000
@@ -13,6 +13,7 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, golang-go
 Built-Using: ${misc:Built-Using}
+Conflicts: golang-clockwork-dev
 Description: Simple fake clock for Go
  Simple fake clock for Go that replaces uses of the time package
  with a test class for testing purposes.