Merge branch 'master' of git.grml.org:grml-tips
authorAlexander Wirt <formorer@grml.org>
Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
committerAlexander Wirt <formorer@grml.org>
Wed, 11 Jan 2012 14:17:44 +0000 (15:17 +0100)
1  2 
debian/postinst
debian/rules

diff --combined 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
@@@ -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.