diff -Nru udev-162/debian/changelog udev-162-2/debian/changelog --- udev-162/debian/changelog 2010-11-15 10:41:14.000000000 +0000 +++ udev-162-2/debian/changelog 2010-10-05 15:10:44.000000000 +0000 @@ -1,27 +1,8 @@ -udev (162-2.2) maverick-proposed; urgency=low +udev (162-2-1cross1) maverick; urgency=low - * debian/udev.initramfs-hook: If /sbin/udevadm.upgrade exists, copy that - into the initramfs instead of the shell script wrapper that we have during - udev upgrades. (LP: #672964) + * Temporarily disable introspection to allow cross building TODO Fix correctly - -- Martin Pitt Fri, 12 Nov 2010 18:37:10 +0100 - -udev (162-2.1) maverick-proposed; urgency=low - - * cdrom_id: Backport two fixes from upstream git head to fix media detection - of drives: - - Fall back to CDROM_DRIVE_STATUS if the drive neither support the SCSI - "GET CONFIGURATION" nor the older (pre-MMC2) "READ DISC INFORMATION" - command. This fixes media detection on the IronKey and similar encrypted - USB sticks. - - Don't read beyond "last track" in TOC. Read the first and last track - from the TOC header, and do not go beyond that stated number of tracks - when reading the TOC. Otherwise we interpret random data which leads to - bogus tracks. (Reported on an IronKey, which reported 1 data track, and - 4 audio tracks which weren't actually present.) - - LP: #653568 - - -- Martin Pitt Fri, 08 Oct 2010 22:26:37 +0200 + -- Peter Pearse Tue, 05 Oct 2010 15:08:48 +0000 udev (162-2) maverick; urgency=low diff -Nru udev-162/debian/rules udev-162-2/debian/rules --- udev-162/debian/rules 2010-11-15 10:41:14.000000000 +0000 +++ udev-162-2/debian/rules 2010-10-05 15:06:24.000000000 +0000 @@ -26,9 +26,16 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build=$(DEB_HOST_GNU_TYPE) + confflags += --build=$(DEB_HOST_GNU_TYPE) --enable-gtk-doc else - confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +# ASSUMES sysrooted paths +# --disable-introspection to se if the rest is OK Nope gtk-doc tries scanning anyway + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --with-pci-ids-path=/usr/$(DEB_HOST_GNU_TYPE)/usr/share/hwdata --disable-introspection +# INTROSPECTION_CFLAGS +# INTROSPECTION_LIBS +# or if desperate +# --disable-introspection + endif VERSION = $(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/.*: //p') @@ -50,7 +57,6 @@ --infodir=\$${infodir}/info \ --with-selinux \ --enable-static \ - --enable-gtk-doc # work around gtk-doc not being able to work in a separate build tree; # debian/rules prep already fixes $srcdir→$builddir, so now copy the @@ -159,7 +165,8 @@ dh_installinit --name=udev-finish --no-start -- start 37 S . dh_installinit --upstart-only --name=udevtrigger --no-start dh_installinit --upstart-only --name=udevmonitor --no-start - dh_install --sourcedir=debian/tmp -Nudev-udeb -Nlibudev0-udeb --fail-missing + @echo "Temp fix for introspection failures" + dh_install --sourcedir=debian/tmp -Nudev-udeb -Nlibudev0-udeb --fail-missing --exclude=gir-1.0 --exclude=girepository-1.0 DH_OPTIONS= dh_install --sourcedir=debian/tmp-udeb -pudev-udeb -plibudev0-udeb dh_link dh_strip