Package: whereami
Version: 0.3.34-0.2
Severity: wishlist
Tags: patch

This is the patch I used in my NMU.

diff -ur ../whereami-0.3.34/debian/changelog 
../whereami-0.3.34-pere/debian/changelog
--- ../whereami-0.3.34/debian/changelog 2008-04-02 19:26:22.000000000 +0200
+++ ../whereami-0.3.34-pere/debian/changelog    2009-09-13 13:55:50.000000000 
+0200
@@ -1,3 +1,16 @@
+whereami (0.3.34-0.2) unstable; urgency=low
+
+  * Non-maintainer upload to fix release goal.
+  * Fix incorrect provides and dependencies in init.d script (Closes:
+    #542442).
+  * Make sure /var/run/whereami is created at boot time if /var/run/
+    is a tmpfs.
+  * Make sure to depend on ${misc:Depends}, as debhelper is used.
+  * Do not ignore errors in postinst.  Thanks lintian for the tip.
+  * Remove last traces of debconf use, left over from last NMU.
+
+ -- Petter Reinholdtsen <p...@debian.org>  Sun, 13 Sep 2009 13:55:27 +0200
+
 whereami (0.3.34-0.1) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
diff -ur ../whereami-0.3.34/debian/control 
../whereami-0.3.34-pere/debian/control
--- ../whereami-0.3.34/debian/control   2008-03-16 08:53:07.000000000 +0100
+++ ../whereami-0.3.34-pere/debian/control      2009-09-13 13:55:19.000000000 
+0200
@@ -10,7 +10,7 @@
 Architecture: all
 Suggests: pcmcia-cs, fping, net-tools, ifplugd, ethtool, squid | oops
 Recommends: wireless-tools, resolvconf, iputils-arping
-Depends: perl, debconf (>= 1.2.9) | debconf-2.0, fping | iputils-ping | 
netbase | dhcp-client
+Depends: ${misc:Depends}, perl, fping | iputils-ping | netbase | dhcp-client
 Description: Automatically reconfigure your (laptop) system for a new location
  whereami is a set of useful scripts and a coordinating system for
  automatically re-locating your computer within the current (network)
diff -ur ../whereami-0.3.34/debian/rules ../whereami-0.3.34-pere/debian/rules
--- ../whereami-0.3.34/debian/rules     2008-04-02 19:26:17.000000000 +0200
+++ ../whereami-0.3.34-pere/debian/rules        2009-09-13 13:54:08.000000000 
+0200
@@ -32,7 +32,6 @@
        dh_testroot
        dh_clean -k
        $(RM) -r debian/$(package)
-       dh_installdebconf
 # Install directories
        dh_installdirs DEBIAN etc etc/init.d etc/$(package) \
                                                        etc/$(package) etc/apm 
etc/apm/scripts.d \
@@ -51,7 +50,7 @@
                                                        
usr/share/doc/$(package)/html/images \
                                                        
usr/share/doc/$(package)/patches/ \
                                                        usr/share/man 
usr/share/man/man8 \
-                                                       var/run/whereami 
var/lib/whereami
+                                                       var/lib/whereami
 
 # Install files
        install bin/$(package) debian/$(package)/usr/sbin/.
diff -ur ../whereami-0.3.34/debian/whereami.init 
../whereami-0.3.34-pere/debian/whereami.init
--- ../whereami-0.3.34/debian/whereami.init     2007-05-09 05:58:00.000000000 
+0200
+++ ../whereami-0.3.34-pere/debian/whereami.init        2009-09-13 
13:48:51.000000000 +0200
@@ -3,11 +3,9 @@
 # Start or stop 'whereami'
 #
 ### BEGIN INIT INFO
-# Provides:          whereami $network
-# Required-Start:
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
+# Provides:          whereami
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Autoconfigure computer according to defined rules
@@ -25,6 +23,9 @@
 
 case "$1" in
     start|restart|force-reload|reload)
+        if [ ! -d /var/run/whereami ] ; then
+            mkdir /var/run/whereami
+        fi
        echo -n "Where Am I: "
       # Find actual whereami
       ACTUAL_WHEREAMI=`readlink /usr/sbin/whereami`
diff -ur ../whereami-0.3.34/debian/whereami.postinst 
../whereami-0.3.34-pere/debian/whereami.postinst
--- ../whereami-0.3.34/debian/whereami.postinst 2007-11-04 12:14:46.000000000 
+0100
+++ ../whereami-0.3.34-pere/debian/whereami.postinst    2009-09-13 
13:53:46.000000000 +0200
@@ -3,16 +3,11 @@
 # $Id: whereami.postinst,v 1.6 2004/02/10 20:52:04 andrew Exp $
 #
 
-if [ "$1" = "configure" ]; then
-    if [ -e /usr/share/debconf/confmodule ]; then
-      . /usr/share/debconf/confmodule
-      db_version 2.0
-    fi
+set -e
 
+if [ "$1" = "configure" ]; then
     # CFG=/etc/whereami/whereami.conf
 
-    [ -e /usr/share/debconf/confmodule ] && db_stop
-
     if [ ! -d /var/lib/whereami ] ; then
       # Create new state files location then move and link files
       mkdir /var/lib/whereami

Happy hacking,
-- 
Petter Reinholdtsen



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to