[kernel] r7769 - people/jurij/ipw3945-daemon/debian

[Jurij Smakov]

Author: jurij-guest
Date: Sun Nov 12 22:35:42 2006
New Revision: 7769

Added:
   people/jurij/ipw3945-daemon/debian/postrm   (contents, props changed)
Modified:
   people/jurij/ipw3945-daemon/debian/changelog
   people/jurij/ipw3945-daemon/debian/control
   people/jurij/ipw3945-daemon/debian/dirs
   people/jurij/ipw3945-daemon/debian/init
   people/jurij/ipw3945-daemon/debian/logrotate
   people/jurij/ipw3945-daemon/debian/modprobe
   people/jurij/ipw3945-daemon/debian/postinst
Log:
Fixes suggested by Loic Minier:
* Rename the package to ipw3945d to make smooth
  upgrades from unofficial packages possible.
* Add ${misc:Depends}.
* Add a postrm script to clean up pid and log
  directories on purge.
* Add Recommends: firmware-ipw3945


Modified: people/jurij/ipw3945-daemon/debian/changelog
==============================================================================
--- people/jurij/ipw3945-daemon/debian/changelog	(original)
+++ people/jurij/ipw3945-daemon/debian/changelog	Sun Nov 12 22:35:42 2006
@@ -1,4 +1,4 @@
-ipw3945-daemon (1.7.22-1) unstable; urgency=low
+ipw3945d (1.7.22-1) unstable; urgency=low
 
   * Initial upload to Debian. Closes: #391686
 

Modified: people/jurij/ipw3945-daemon/debian/control
==============================================================================
--- people/jurij/ipw3945-daemon/debian/control	(original)
+++ people/jurij/ipw3945-daemon/debian/control	Sun Nov 12 22:35:42 2006
@@ -1,4 +1,4 @@
-Source: ipw3945-daemon
+Source: ipw3945d
 Section: non-free/net
 Priority: extra
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
@@ -6,9 +6,10 @@
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 5)
 
-Package: ipw3945-daemon
+Package: ipw3945d
 Architecture: i386 amd64
-Depends: adduser, lsb-base (>= 3.1), ${shlibs:Depends}
+Depends: adduser, lsb-base (>= 3.1), ${shlibs:Depends}, ${misc:Depends}
+Recommends: firmware-ipw3945
 Description: Binary userspace regulatory daemon for Intel PRO/Wireless 3945ABG cards
  The regulatory daemon is responsible for controlling and configuring 
  aspects of the hardware required to operate the device within 

Modified: people/jurij/ipw3945-daemon/debian/dirs
==============================================================================
--- people/jurij/ipw3945-daemon/debian/dirs	(original)
+++ people/jurij/ipw3945-daemon/debian/dirs	Sun Nov 12 22:35:42 2006
@@ -1,2 +1,2 @@
-var/run/ipw3945-daemon
-var/log/ipw3945-daemon
+var/run/ipw3945d
+var/log/ipw3945d

Modified: people/jurij/ipw3945-daemon/debian/init
==============================================================================
--- people/jurij/ipw3945-daemon/debian/init	(original)
+++ people/jurij/ipw3945-daemon/debian/init	Sun Nov 12 22:35:42 2006
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:          ipw3945-daemon
+# Provides:          ipw3945d
 # Required-Start:    mountkernfs $local_fs
 # Required-Stop:     $local_fs
 # Default-Start:     S
@@ -16,9 +16,9 @@
 DAEMON_OWNER="Debian-ipw3945d:Debian-ipw3945d"
 DAEMON_BINARY="/sbin/ipw3945d"
 SYS_CMD_PERM="744"
-DAEMON_PID_DIR="/var/run/ipw3945-daemon"
+DAEMON_PID_DIR="/var/run/ipw3945d"
 DAEMON_PID_FILE="${DAEMON_PID_DIR}/ipw3945d.pid"
-DAEMON_LOG_FILE="/var/log/ipw3945-daemon/ipw3945d.log"
+DAEMON_LOG_FILE="/var/log/ipw3945d/ipw3945d.log"
 
 # Occasionally we will be started by a modprobe hook very early,
 # when the filesystem might not be mounted rw yet. In this case

Modified: people/jurij/ipw3945-daemon/debian/logrotate
==============================================================================
--- people/jurij/ipw3945-daemon/debian/logrotate	(original)
+++ people/jurij/ipw3945-daemon/debian/logrotate	Sun Nov 12 22:35:42 2006
@@ -1,4 +1,4 @@
-/var/log/ipw3945-daemon/ipw3945d.log {
+/var/log/ipw3945d/ipw3945d.log {
     rotate 6
     weekly
 }

Modified: people/jurij/ipw3945-daemon/debian/modprobe
==============================================================================
--- people/jurij/ipw3945-daemon/debian/modprobe	(original)
+++ people/jurij/ipw3945-daemon/debian/modprobe	Sun Nov 12 22:35:42 2006
@@ -1,2 +1,2 @@
-install ipw3945 modprobe --ignore-install ipw3945 && /etc/init.d/ipw3945-daemon modprobe-start
-remove  ipw3945 /etc/init.d/ipw3945-daemon modprobe-stop || modprobe -r --ignore-remove ipw3945
+install ipw3945 modprobe --ignore-install ipw3945 && /etc/init.d/ipw3945d modprobe-start
+remove  ipw3945 /etc/init.d/ipw3945d modprobe-stop || modprobe -r --ignore-remove ipw3945

Modified: people/jurij/ipw3945-daemon/debian/postinst
==============================================================================
--- people/jurij/ipw3945-daemon/debian/postinst	(original)
+++ people/jurij/ipw3945-daemon/debian/postinst	Sun Nov 12 22:35:42 2006
@@ -4,8 +4,8 @@
   configure)
     adduser --quiet --system --no-create-home --force-badname \
             --group Debian-ipw3945d
-    chown Debian-ipw3945d:Debian-ipw3945d /var/run/ipw3945-daemon
-    chown Debian-ipw3945d:Debian-ipw3945d /var/log/ipw3945-daemon
+    chown Debian-ipw3945d:Debian-ipw3945d /var/run/ipw3945d
+    chown Debian-ipw3945d:Debian-ipw3945d /var/log/ipw3945d
     ;;
   abort-upgrade|abort-remove|abort-deconfigure)
     ;;

Added: people/jurij/ipw3945-daemon/debian/postrm
==============================================================================
--- (empty file)
+++ people/jurij/ipw3945-daemon/debian/postrm	Sun Nov 12 22:35:42 2006
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ "${1}" = "purge" ]; then
+  rm -rf /var/run/ipw3945d
+  rm -rf /var/log/ipw3945d
+fi