Merge branch 'devel' of github.com:garabik/grc into devel

conf.mount

@@ -1 +0,0 @@
-conf.mount2

conf.mount

@@ -0,0 +1,11 @@
+# Intended for colouring 'mount' output
+# written by Emanuele Aina
+
+regexp=^(.*) on (.*) type (.*) \((.*)\)
+colours=default,green,yellow,blue,magenta
+=====
+regexp=^cgroup.*
+colours=bright_black
+=====
+regexp=^tmpfs.*
+colours=bright_black

conf.mount2

@@ -1,11 +0,0 @@
-# Intended for colouring 'mount' output
-# written by Emanuele Aina
-
-regexp=^(.*) on (.*) type (.*) \((.*)\)
-colours=default,green,yellow,blue,magenta
-=====
-regexp=^cgroup.*
-colours=bright_black
-=====
-regexp=^tmpfs.*
-colours=bright_black

debian/control

@@ -3,11 +3,11 @@ Section: text
 Priority: optional
 Maintainer: Radovan Garabík <garabik@kassiopeia.juls.savba.sk>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>=9)
+Build-Depends: debhelper (>=9), python
 
 Package: grc
 Architecture: all
-Depends: python, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Description: generic colouriser for everything
  generic colouriser, can be used to colourise logfiles,
  output of commands, arbitrary text....

debian/rules

@@ -47,7 +47,7 @@ binary-indep: build install
 	dh_installman grc.1 grcat.1
 	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
@@ -57,6 +57,7 @@ binary-indep: build install
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl
+	dh_python2
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums

default

@@ -1 +0,0 @@
-/usr/share/grc/