[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: RFC: discover 1 -> 2 transition plan for Debian

[Ian Murdock]
> That's correct. We can upload Discover 2 whenever you are ready to
> do the transition. I actually don't have an up to date key in the
> keyring, so Jeff Licquia will be uploading Discover 2 for us for
> now.

Sounds good.  I'll leave the uploading to Jeff, assuming it happens
fairly fast after the discover1 packages are uploaded.  I do not want
the discover1 packages to hit the archive without the discover 2
packages following shortly after. :)

> I'm pretty sure I merged all patches. The only change I remember
> making was putting the PCMCIA headers back in sysdeps/linux/pcmcia
> rather than in the top-level directory, where Gaudenz put them. If I
> missed anything, it was probably an oversight, so please drop me a
> line.

Checking the differences, I believe you are right.  Only the PCMCIA
header code is changed.  On the negative side, the version in
subversion do not seem to work.  At least I get this error message
when I build it in my unstable chroot:

  checking for check - version >= 0.8.2... no
  *** Could not run check test program, checking why...
  *** The test program failed to compile or link. See the file config.log for
  *** the exact error that occurred.
  You will not be able to run the test suite, no worries.
  checking for PCMCIA headers in /lib/modules/2.4.24-1-686/build/include... no
  checking for PCMCIA headers in
    /usr/src/kernel-headers-2.4.24-1-686/include... no
  checking for PCMCIA headers in /usr/src/linux*/include... no
  checking for PCMCIA headers in /usr/local/src/linux*/include... no
  configure: error: Could not find PCMCIA headers.
  make: *** [configure-deb-stamp] Error 1
  debuild: fatal error at line 763:
  dpkg-buildpackage failed!

I got around the problem using this patch:

Index: debian/rules
--- debian/rules        (revision 4146)
+++ debian/rules        (working copy)
@@ -53,6 +53,7 @@
 #      done)
 # if we found some, pass them to configure

+PCMCIA_HEADERS := $(shell pwd)/sysdeps/linux
 ifneq ($(PCMCIA_HEADERS),)

Reply to: