Bug#348261: dict-foldoc 20030919-5.1 NMU

[Matej Vela]

Hello,

I'm doing an NMU of dict-foldoc to fix #356044 and #348261; diff
attached.

Thanks,

Matej

diff -u dict-foldoc-20030919/debian/changelog 
dict-foldoc-20030919/debian/changelog
--- dict-foldoc-20030919/debian/changelog
+++ dict-foldoc-20030919/debian/changelog
@@ -1,3 +1,12 @@
+dict-foldoc (20030919-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: Fix build failure with make 3.81+.  Thanks to Matt Kraai
+    for the patch.  Closes: #356044.
+  * debian/postinst, debian/postrm: Use invoke-rc.d.  Closes: #348261.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Fri, 17 Mar 2006 09:48:59 +0100
+
 dict-foldoc (20030919-5) unstable; urgency=high
   * Sometime in 2003, the author changed the license from the very
     permissive license previously used to the GFDL. with no Invariant
diff -u dict-foldoc-20030919/debian/rules dict-foldoc-20030919/debian/rules
--- dict-foldoc-20030919/debian/rules
+++ dict-foldoc-20030919/debian/rules
@@ -60,9 +60,9 @@
 stamp-build:
 # Builds the binary package.
        $(checkdir)
-       cat Dictionary debian/Dictionary.debian|\
-       /usr/share/konwert/filters/iso1-ascii |\
-       /usr/bin/dictfmt -f --allchars -u 
http://foldoc.doc.ic.ac.uk/foldoc/Dictionary.gz\
+       cat Dictionary debian/Dictionary.debian| \
+       /usr/share/konwert/filters/iso1-ascii | \
+       /usr/bin/dictfmt -f --allchars -u 
http://foldoc.doc.ic.ac.uk/foldoc/Dictionary.gz \
        -s "The Free On-line Dictionary of Computing (19 Sep 2003)" foldoc
        /usr/bin/dictzip -v foldoc.dict
        touch stamp-build
diff -u dict-foldoc-20030919/debian/postinst 
dict-foldoc-20030919/debian/postinst
--- dict-foldoc-20030919/debian/postinst
+++ dict-foldoc-20030919/debian/postinst
@@ -7,7 +7,13 @@
 case "$1" in 
      configure)
      if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
-     if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart ;fi
+     if [ -x /etc/init.d/dictd ]; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+           invoke-rc.d dictd restart
+       else
+           /etc/init.d/dictd restart
+       fi
+     fi
 
      exit 0
      ;;
diff -u dict-foldoc-20030919/debian/postrm dict-foldoc-20030919/debian/postrm
--- dict-foldoc-20030919/debian/postrm
+++ dict-foldoc-20030919/debian/postrm
@@ -5,7 +5,13 @@
 case "$1" in 
     remove|purge)
      if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
-     if [ -x /etc/init.d/dictd ]; then /etc/init.d/dictd restart; fi
+     if [ -x /etc/init.d/dictd ]; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+           invoke-rc.d dictd restart
+       else
+           /etc/init.d/dictd restart
+       fi
+     fi
 
      exit 0
      ;;