pcmcia-cs: new changes from Debian require merging

Bug #25423 reported by Merge-o-Matic
8
Affects Status Importance Assigned to Milestone
pcmcia-cs (Ubuntu)
Fix Released
Medium
Colin Watson

Bug Description

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/pcmcia-cs/

In particular see the REPORT file for details.

If this is the first time you have received one of these
bugs, or are just unsure what to do, see:

        http://people.ubuntu.com/~scott/ongoing-merge/README

 -- Your friendly neighbourhood Merge-O-Matic.

Revision history for this message
Merge-o-Matic (mom-ubuntu) wrote :

This is a reminder, further changes have occurred in Debian
since this report was filed. The URL above has been updated
with the new source package.

Revision history for this message
Colin Watson (cjwatson) wrote :
Download full text (6.8 KiB)

pcmcia-cs (3.2.8-5.2ubuntu1) dapper; urgency=low

  * Resynchronise with Debian.
  * Convert patches to upstream source into dpatches in the 3xx range.

 -- Colin Watson <email address hidden> Mon, 21 Nov 2005 11:05:24 +0000

pcmcia-cs (3.2.8-5.2) unstable; urgency=low

  * Non-maintainer upload.
  * Remove non-writeable $(UDEBDIR)/etc/init.d/pcmcia before trying to copy
    over it, fixing build failure on XFS filesystems.

 -- Colin Watson <email address hidden> Fri, 21 Oct 2005 18:41:11 +0100

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 address hidden> 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
    statically. Closes: #321095.
  * Improved module loading code somewhat.
  * If $PCIC is not defined and PCMCIA sockets are not available, just
    output a simple message saying so and exit. Only on 2.6 kernels.
  * Put a /etc/default/pcmcia in the udeb which contains
    PCIC=i82365. Don't default to it anymore in the init script if PCIC is
    empty.

 -- Per Olofsson <email address hidden> Wed, 3 Aug 2005 18:17:32 +0200

pcmcia-cs (3.2.8-4) unstable; urgency=low

  * Also check for /dev/.udevdb when determining whether to create/remove
    device nodes or not. Closes: #317546.
  * Don't add the -q option to MODPROBE_OPTIONS. There's no point I think,
    just something I misunderstood about the Ubuntu patch.
  * Removed dependency on pnpbios-tools. Closes: #321081.
  * Don't build and install PnP BIOS tools if the pnpbios-tools package is
    not being built on this architecture.

 -- Per Olofsson <email address hidden> Wed, 3 Aug 2005 09:52:10 +0200

pcmcia-cs (3.2.8-3) unstable; urgency=low

  * Added config entries for the atmel_cs cards SMC 2632W-V2 and
    3CRSHPW_96. Thanks to Ubuntu.
  * Don't try to create device nodes on udev systems. Don't try to remove
    them either (the same on devfs systems). Thanks to Ubuntu.
    Closes: #317546.
  * Split out lspnp and setpnp to their own package,
    pnpbios-tools. Closes: #307224.
  * Use the -s option with debhelper instead of -a.
  * Always try to remove all modules when stopping PCMCIA, even if ds is
    not loaded. Thanks to Stephen Gildea. Closes: #319485.
  * Added some PNP IDs from Ryan Underwood. Closes: #305404.
  * Build a smaller cardmgr for the udeb, using -Os and
    -fomit-frame-pointer. Closes: #314377.
  * Rewrote the init script, including modifications from Ubuntu. Made it
    LSB-compliant (or at least I think so). Placed it in debian/ instead
    of patching the upstream one.
  * Added config entries for atmel_cs cards. Thanks to Ubuntu.
  * Updated Standards-Version to 3.6.2.0.
  * Made pcmcia-source recommend libc6-dev | libc-dev.
  * Fixed wrong sections in manpages.
  * Made cardmgr not log to the console. This prevents it from spewing out
    a lot of messages early in the boot process, when syslog is not
    availa...

Read more...

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.