From: Alexander Wirt <formorer@grml.org>
Date: Wed, 11 Jan 2012 14:17:44 +0000 (+0100)
Subject: Merge branch 'master' of git.grml.org:grml-tips
X-Git-Tag: v0.6.2~4
X-Git-Url: http://git.grml.org/?p=grml-tips.git;a=commitdiff_plain;h=3bd6d677c1f9a06839ef21786eb52b570a8d430b;hp=-c

Merge branch 'master' of git.grml.org:grml-tips
---

3bd6d677c1f9a06839ef21786eb52b570a8d430b
diff --combined debian/postinst
index 0b75c31,aa0a6a6..c4dc5c2
--- a/debian/postinst
+++ b/debian/postinst
@@@ -1,15 -1,17 +1,17 @@@
  #!/bin/sh -e
  
 -if [ -x /usr/bin/grml-tips-tags ]
 +if [ -x /usr/lib/grml-tips/grml-tips-tags ]
  then
  	echo -n "Generating grml-tips tag database: "
 -	if grml-tips-tags
 +	if /usr/lib/grml-tips/grml-tips-tags
  	then
  		echo "Ok"
  	else
- 		echo "Failed"
+ 		echo "Failed" >&2
+ 		exit 1
  	fi
  fi
  
-  #DEBHELPER#
-  exit 0
+ #DEBHELPER#
+ 
+ exit 0
diff --combined debian/rules
index 12471e2,e345fc4..b89a78c
--- a/debian/rules
+++ b/debian/rules
@@@ -18,14 -18,14 +18,14 @@@ clean
  	dh_clean 
  	rm -f grml-tips.1
  
- install:
+ install: build
  	dh_testdir
  	dh_testroot
  	dh_clean -k 
  	dh_installdirs usr/bin usr/share/grml-tips
  
  	install -m 755 grml-tips debian/grml-tips/usr/bin/grml-tips
 -	install -m 755 grml-tips-tags debian/grml-tips/usr/bin/grml-tips-tags
 +	install -m 755 grml-tips-tags debian/grml-tips/usr/lib/grml-tips/grml-tips-tags
  	install -m 644 grml_tips debian/grml-tips/usr/share/grml-tips/grml_tips
  
  # Build architecture-dependent files here.