Initialize git-dpm

7 files changed, 28 insertions, 14 deletions

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;"
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..f5d90e2
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+8ff43df31792a49ae24812fd40f9ab89f023a721
+8ff43df31792a49ae24812fd40f9ab89f023a721
+1dcd5b445e80c06c4b642ab7fbf4a43fe8857b5a
+1dcd5b445e80c06c4b642ab7fbf4a43fe8857b5a
+brlaser_3.orig.tar.xz
+ecbc5a765a9ed4aab0b348f0394a96882b1caba6
+22656
diff --git a/debian/patches/8b99cce-Add-Brother-DCP-7055.patch b/debian/patches/0001-Add-Brother-DCP-7055.patch
index ab7ade1..7b1c493 100644
--- a/debian/patches/8b99cce-Add-Brother-DCP-7055.patch
+++ b/debian/patches/0001-Add-Brother-DCP-7055.patch
@@ -1,7 +1,7 @@
-From 8b99cced73ffb27c65e6f5aa98cc42a998ad748d Mon Sep 17 00:00:00 2001
+From 04d35cf51861c7200b79864f0beba7fbf2805790 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
+Subject: Add Brother DCP-7055
 
 Looks like this printer has some configuration options beyond what
 brlaser currently knows about. But this offers basic functionality.
@@ -26,20 +26,17 @@ 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
+@@ -82,6 +82,13 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
+   PCFileName "br7030.ppd"
  }
  
- {
++{
 +  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 --git a/debian/patches/93138fe-Add-missing-include-string.patch b/debian/patches/0002-Add-missing-include-string.patch
index 7a58220..fd7e88d 100644
--- a/debian/patches/93138fe-Add-missing-include-string.patch
+++ b/debian/patches/0002-Add-missing-include-string.patch
@@ -1,10 +1,10 @@
-From 93138fec87290ffbdd4919f313ea513eadca749c Mon Sep 17 00:00:00 2001
+From 8ff43df31792a49ae24812fd40f9ab89f023a721 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>
+Subject: 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/debian/patches/series b/debian/patches/series
index 0a559b0..8a305ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-8b99cce-Add-Brother-DCP-7055.patch
-93138fe-Add-missing-include-string.patch
+0001-Add-Brother-DCP-7055.patch
+0002-Add-missing-include-string.patch
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 {