diff -Nru brlaser-3/debian/changelog brlaser-3/debian/changelog
--- brlaser-3/debian/changelog	2015-08-28 12:53:49.000000000 +0200
+++ brlaser-3/debian/changelog	2016-04-25 21:28:32.000000000 +0200
@@ -1,8 +1,20 @@
-brlaser (3-3build1) wily; urgency=medium
+brlaser (3-5) unstable; urgency=medium
 
-  * No-change rebuild using GCC 5.
+  [ Peter Spiess-Knafl ]
+  * Add patch to add missing #include <string> (Closes: #822500)
 
- -- Matthias Klose <doko@ubuntu.com>  Fri, 28 Aug 2015 10:53:49 +0000
+  [ Didier Raboud ]
+  * Bump S-V to 3.9.8 without changes needed
+  * Add debian/gbp.conf to cope with the new git branches
+
+ -- Didier Raboud <odyx@debian.org>  Mon, 25 Apr 2016 21:28:24 +0200
+
+brlaser (3-4) unstable; urgency=medium
+
+  * Import upstream patch to add support for Brother DCP-7055
+  * Bump Standards-Version to 3.9.7 without changes needed
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 25 Feb 2016 19:39:14 +0100
 
 brlaser (3-3) unstable; urgency=medium
 
diff -Nru brlaser-3/debian/control brlaser-3/debian/control
--- brlaser-3/debian/control	2014-07-09 08:48:03.000000000 +0200
+++ brlaser-3/debian/control	2016-04-25 21:20:49.000000000 +0200
@@ -11,7 +11,7 @@
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=printing/brlaser.git
 Homepage: https://github.com/pdewacht/brlaser
 XS-Testsuite: autopkgtest
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 
 Package: printer-driver-brlaser
 Architecture: any
diff -Nru brlaser-3/debian/gbp.conf brlaser-3/debian/gbp.conf
--- brlaser-3/debian/gbp.conf	1970-01-01 01:00:00.000000000 +0100
+++ brlaser-3/debian/gbp.conf	2016-04-25 21:20:24.000000000 +0200
@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-branch = upstream/latest
+debian-branch = debian/master
+pristine-tar = True
+
diff -Nru brlaser-3/debian/patches/8b99cce-Add-Brother-DCP-7055.patch brlaser-3/debian/patches/8b99cce-Add-Brother-DCP-7055.patch
--- brlaser-3/debian/patches/8b99cce-Add-Brother-DCP-7055.patch	1970-01-01 01:00:00.000000000 +0100
+++ brlaser-3/debian/patches/8b99cce-Add-Brother-DCP-7055.patch	2016-04-25 21:20:49.000000000 +0200
@@ -0,0 +1,45 @@
+From 8b99cced73ffb27c65e6f5aa98cc42a998ad748d Mon Sep 17 00:00:00 2001
+From: Peter De Wachter <pdewacht@gmail.com>
+Date: Tue, 25 Nov 2014 00:02:23 +0100
+Subject: [PATCH] Add Brother DCP-7055
+
+Looks like this printer has some configuration options beyond what
+brlaser currently knows about. But this offers basic functionality.
+---
+ README.md      | 1 +
+ brlaser.drv.in | 7 +++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/README.md b/README.md
+index da4cb95..5a7f8c0 100644
+--- a/README.md
++++ b/README.md
+@@ -9,6 +9,7 @@ don't work, this one might help.
+ It is known to support these printers:
+ 
+ * Brother DCP-7030
++* Brother DCP-7055
+ * Brother DCP-7065DN
+ 
+ Copyright
+diff --git a/brlaser.drv.in b/brlaser.drv.in
+index 364c319..9f83b8e 100644
+--- a/brlaser.drv.in
++++ b/brlaser.drv.in
+@@ -83,6 +83,13 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
+ }
+ 
+ {
++  ModelName "DCP-7055"
++  Attribute "NickName" "" "Brother DCP-7055, using @PACKAGE@ v@VERSION@"
++  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7055;CLS:PRINTER;CID:Brother Laser Type1;"
++  PCFileName "br7055.ppd"
++}
++
++{
+   ModelName "DCP-7065DN"
+   Attribute "NickName" "" "Brother DCP-7065DN, using @PACKAGE@ v@VERSION@"
+   Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7065DN;CLS:PRINTER;CID:Brother Laser Type1;"
+-- 
+2.7.0
+
diff -Nru brlaser-3/debian/patches/93138fe-Add-missing-include-string.patch brlaser-3/debian/patches/93138fe-Add-missing-include-string.patch
--- brlaser-3/debian/patches/93138fe-Add-missing-include-string.patch	1970-01-01 01:00:00.000000000 +0100
+++ brlaser-3/debian/patches/93138fe-Add-missing-include-string.patch	2016-04-25 21:20:49.000000000 +0200
@@ -0,0 +1,23 @@
+From 93138fec87290ffbdd4919f313ea513eadca749c Mon Sep 17 00:00:00 2001
+From: Peter Spiess-Knafl <dev@spiessknafl.at>
+Date: Mon, 25 Apr 2016 15:02:37 +0200
+Subject: [PATCH] Add missing #include <string>
+Bug-Debian: https://bugs.debian.org/822500
+Forwarded: https://github.com/pdewacht/brlaser/pull/9
+
+---
+ src/brdecode.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/brdecode.cc b/src/brdecode.cc
+index d5c4c0d..bcd3ec7 100644
+--- a/src/brdecode.cc
++++ b/src/brdecode.cc
+@@ -21,6 +21,7 @@
+ #include <algorithm>
+ #include <exception>
+ #include <vector>
++#include <string>
+ 
+ namespace {
+ 
diff -Nru brlaser-3/debian/patches/series brlaser-3/debian/patches/series
--- brlaser-3/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ brlaser-3/debian/patches/series	2016-04-25 21:20:49.000000000 +0200
@@ -0,0 +1,2 @@
+8b99cce-Add-Brother-DCP-7055.patch
+93138fe-Add-missing-include-string.patch