Package: pcmcia-cs
Version: 3.2.8-5
Severity: wishlist

Hi,

Bugs #329099, #329100, and #329101 were collectively causing me problems
for installer testing, so I prepared an NMU and uploaded it to the 3-day
delayed queue in gluck:~tfheen/DELAYED/3-day/. Here's the diff:

diff -u pcmcia-cs-3.2.8/debian/pcmcia-cs.pcmcia.init 
pcmcia-cs-3.2.8/debian/pcmcia-cs.pcmcia.init
--- pcmcia-cs-3.2.8/debian/pcmcia-cs.pcmcia.init
+++ pcmcia-cs-3.2.8/debian/pcmcia-cs.pcmcia.init
@@ -35,7 +35,7 @@
     }
     log_end_msg ()
     {
-       if [ "$1" == 0 ]; then
+       if [ "$1" = 0 ]; then
            echo "   ...done."
        else
            echo "   ...fail!"
@@ -161,6 +161,9 @@
        if ! grep -q ' pcmcia$' /proc/devices; then
            modprobe ds || failed_to_load ds
        fi
+       if ! grep -q ' pcmcia$' /proc/devices; then
+           modprobe pcmcia || failed_to_load pcmcia
+       fi
 
        if [ -s /var/run/cardmgr.pid ] \
            && kill -0 `cat /var/run/cardmgr.pid` 2>/dev/null; then
diff -u pcmcia-cs-3.2.8/debian/rules pcmcia-cs-3.2.8/debian/rules
--- pcmcia-cs-3.2.8/debian/rules
+++ pcmcia-cs-3.2.8/debian/rules
@@ -273,6 +273,7 @@
 #      dh_installmime -s
        dh_installinit -s --name=pcmcia -r --no-start -- \
                start 40 S . stop 88 0 6 .
+       cp -a $(CSDIR)/etc/init.d/pcmcia $(UDEBDIR)/etc/init.d/
 #      dh_installcron -s
 #      dh_installinfo -s
 #      dh_undocumented -s
diff -u pcmcia-cs-3.2.8/debian/changelog pcmcia-cs-3.2.8/debian/changelog
--- pcmcia-cs-3.2.8/debian/changelog
+++ pcmcia-cs-3.2.8/debian/changelog
@@ -1,3 +1,12 @@
+pcmcia-cs (3.2.8-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Try to load pcmcia for >= 2.6.11 as well as ds (closes: #329099).
+  * Install rewritten init script in pcmcia-cs-udeb too (closes: #329100).
+  * Fix bashism in init script installer support path (closes: #329101).
+
+ -- Colin Watson <[EMAIL PROTECTED]>  Tue, 18 Oct 2005 20:12:00 +0100
+
 pcmcia-cs (3.2.8-5) unstable; urgency=low
 
   * Don't try to load the ds module if it is compiled in

Thanks,

-- 
Colin Watson                                       [EMAIL PROTECTED]


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to