Merge branch 'master' of github.com:dpavlin/Printer-Zebra
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 17 Jun 2012 15:18:30 +0000 (17:18 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 17 Jun 2012 15:18:52 +0000 (17:18 +0200)
Conflicts:
bin/debian-install.sh

1  2 
bin/debian-install.sh

diff --combined 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/