w_scan 20101001 FTBFS due to unnecessary inclusion of <linux/videodev.h> in countries.c

[Daniel T Chen]

SRU Impact statement:
During the SRU process for bug 771786, I discovered that newer kernels no longer ship <linux/videodev.h>, which causes w_scan 20101001 to FTBFS in natty{,-proposed}.

Resolution / patch:
Remove the inclusion of <linux/videodev.h> from countries.c. This change/fix first appeared in upstream version 20110306, and oneiric's source package already contains the fix.

TEST CASE:
Attempt to compile natty-proposed's 20101001-1ubuntu0.1 and note how it FTBFS, e.g., https://launchpadlibrarian.net/75766429/buildlog_ubuntu-natty-amd64.w-scan_20101001-1ubuntu0.1_FAILEDTOBUILD.txt.gz.

Regression potential:
None - the header is unused.

[Daniel T Chen (crimsun)]

Please note that the above debdiff appears larger than functionally due to the renaming of ubuntu-changes-20101001-1ubuntu0.1 -> fix-xine-formatted-output-for-8VSB-16VSB-modulations.patch in debian/patches.

[Daniel T Chen (crimsun)]

Build log:

I: Setting up ccache
I: Installing the build-deps
 -> Attempting to satisfy build-dependencies
 -> Creating pbuilder-satisfydepends-dummy package
Package: pbuilder-satisfydepends-dummy
Version: 0.invalid.0
Architecture: amd64
Maintainer: Debian Pbuilder Team <email address hidden>
Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder
 This package was created automatically by pbuilder to satisfy the
 build-dependencies of the package being currently built.
Depends: debhelper (>= 7.0.50~), linux-libc-dev (>= 2.6.29) | dvb-s2api-liplianin-headers
dpkg-deb: building package `pbuilder-satisfydepends-dummy' in `/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'.
Selecting previously deselected package pbuilder-satisfydepends-dummy.
(Reading database ... 13361 files and directories currently installed.)
Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ...
dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring anyway as you requested:
 pbuilder-satisfydepends-dummy depends on debhelper (>= 7.0.50~); however:
  Package debhelper is not installed.
Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
The following NEW packages will be installed:
  bsdmainutils{a} debhelper{a} gettext{a} gettext-base{a} groff-base{a}
  html2text{a} intltool-debian{a} libcroco3{a} libpipeline1{a} libunistring0{a}
  libxml2{a} man-db{a} po-debconf{a}
The following packages are RECOMMENDED but will NOT be installed:
  curl libmail-sendmail-perl lynx-cur wget xml-core
0 packages upgraded, 13 newly installed, 0 to remove and 0 not upgraded.
Need to get 5447 kB of archives. After unpacking 16.9 MB will be used.
Get:1 http://us.archive.ubuntu.com/ubuntu/ natty-updates/main libxml2 amd64 2.7.8.dfsg-2ubuntu0.1 [664 kB]
Get:2 http://archive.ubuntu.com/ubuntu/ natty/main bsdmainutils amd64 8.2.2 [199 kB]
Get:3 http://archive.ubuntu.com/ubuntu/ natty/main gettext-base amd64 0.18.1.1-3ubuntu1 [80.6 kB]
Get:4 http://archive.ubuntu.com/ubuntu/ natty/main groff-base amd64 1.21-5 [1052 kB]
Get:5 http://archive.ubuntu.com/ubuntu/ natty/main libpipeline1 amd64 1.2.0-1 [26.1 kB]
Get:6 http://archive.ubuntu.com/ubuntu/ natty/main man-db amd64 2.5.9-4 [741 kB]
Get:7 http://archive.ubuntu.com/ubuntu/ natty/main html2text amd64 1.3.2a-15 [104 kB]
Get:8 http://archive.ubuntu.com/ubuntu/ natty/main libcroco3 amd64 0.6.2-1 [101 kB]
Get:9 http://archive.ubuntu.com/ubuntu/ natty/main libunistring0 amd64 0.9.3-3 [425 kB]
Get:10 http://archive.ubuntu.com/ubuntu/ natty/main gettext amd64 0.18.1.1-3ubuntu1 [1329 kB]
Get:11 http://archive.ubuntu.com/ubuntu/ natty/main intltool-debian all 0.35.0+20060710.1 [31.6 kB]
Get:12 http://archive.ubuntu.com/ubuntu/ natty/main po-debconf all 1.0.16+nmu1 [212 kB]
Get:13 http://archive.ubuntu.com/ubuntu/ natty/main debhelper all 8.1.2ubuntu4 [482 kB]
Fetched 5447 kB in 12s (447 kB/s)
Preconfiguring packages ...
Selecting previously deselected package bsdmainutils.
(Reading database ... 13361 files and directories currently installed.)
Unpacking bsdmainutils (from .../b...

[Chris Halse Rogers (raof)]

The changes themselves look good here - thanks for updating the patches to proper patches. However, could you please re-spin so that the changes file contains the changelog entries since the current version in Natty (ie: the last two uploads). I understand that our tools want that to work properly.

[Clint Byrum (clint-fewbar)]

Hello Daniel, or anyone else affected,

Accepted w-scan into natty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

[dino99 (9d9)]

eol reached https://wiki.ubuntu.com/Releases