From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 17 Jun 2012 15:18:30 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dpavlin/Printer-Zebra
X-Git-Url: http://git.rot13.org/?p=Printer-Zebra.git;a=commitdiff_plain;h=2aec78145015f59aaef6fd7a690c328e8d258967

Merge branch 'master' of github.com:dpavlin/Printer-Zebra

Conflicts:
	bin/debian-install.sh
---

2aec78145015f59aaef6fd7a690c328e8d258967
diff --cc bin/debian-install.sh
index d8670a7,dcd4c4f..2694975
--- a/bin/debian-install.sh
+++ b/bin/debian-install.sh
@@@ -1,4 -1,3 +1,6 @@@
  #!/bin/sh -x
  
- sudo apt-get install ttf-mscorefonts-installer librsvg2-bin netpbm
+ sudo apt-get install ttf-mscorefonts-installer librsvg2-bin netpbm rlpr
++
++# install font system-wide
 +sudo ln -s `pwd`/fonts/AdvCBe.ttf /usr/share/fonts/truetype/