Merge branch 'master' of ssh://git@git.grml.org/grml-scripts

diff --git a/debian/changelog b/debian/changelog
index a43ad3f..deea6c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 grml-scripts (1.1.19) unstable; urgency=low
 
   * Some minor cleanups for lintian:
-     - cleanup of lintian's override file
-     - drop unneeded /bin and /sbin from debian/dirs
-
- -- Michael Prokop <mika@grml.org>  Mon, 06 Apr 2009 09:24:25 +0200
+     - Cleanup of lintian's override file
+     - Drop unneeded /bin and /sbin from debian/dirs
+     - Bump Standard Version to 3.8.1
+     - Bump Compat Version to 5
+  * grml-info: add support for xlinks2 as dillo isn't available
+    in Debian/unstable due to removal of libgtk1.2
+
+ -- Michael Prokop <mika@grml.org>  Sat, 16 May 2009 19:18:30 +0200
 
 grml-scripts (1.1.18) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5

diff --git a/debian/control b/debian/control
index 0c48463..de2a4fe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
 Uploaders: Michael Gebetsroither <gebi@grml.org>
 Build-Depends: debhelper (>= 4.0.0), dietlibc-dev, xsltproc, docbook-xsl, asciidoc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://git.grml.org/?p=grml-scripts.git
 Vcs-git: git://git.grml.org/grml-scripts.git
 Vcs-Browser: http://git.grml.org/?p=grml-scripts.git

diff --git a/usr_bin/grml-info b/usr_bin/grml-info
index 391ca6e..005be75 100755 (executable)
--- a/usr_bin/grml-info
+++ b/usr_bin/grml-info
@@ -14,6 +14,8 @@ local PAGE='/usr/share/doc/grml-docs/startpage.html'
 if [ -n "$DISPLAY" ]; then
    if check4progs dillo ; then
       dillo $PAGE
+   elif check4progs xlinks2 ; then
+      xlinks2 -mode 640x480 $PAGE
    elif check4progs firefox ; then
       firefox $PAGE
    elif check4progs x-www-browser ; then