[Pkg-virtualbox-devel] patch to support/complete lenny backporting

[Corey Wright]

first, thanks for making virtualbox-ose relatively easy to backport to
lenny.  today i built squeeze's 3.2.0-dfsg-1 in a lenny pbuilder (lenny
amd64 chroot on lenny amd64).

secondly, i had a little bit of trouble with the build as dh_install
doesn't work as virtualbox-ose's debian/rules expects.

"dh_install src1/file1 dst1 src2/file2 dst2" != "dh_install src1/file1 dst1
&& dh_install src2/file2 dst2", but is instead equivalent to "cp -a
src1/file1 dst1 src2/file2 dst2".  this is also in line with the man page:
"dh_install <options/> [file[...]dest]" (one or more "file" ending with a
"dest").

<log>
   debian/rules override_dh_install                    
make[1]: Entering directory `/usr/src/3.2.0-dfsg-1/virtualbox-ose-3.2.0-dfsg'
dh_install -pvirtualbox-ose-guest-x11 src/VBox/Additions/x11/Installer/vboxvideo.ids /usr/share/xserver-xorg/pci src/VBox/Additions/linux/installer/90-vboxguest.fdi /usr/share/hal/fdi/policy/20thirdparty            
cp: cannot stat `debian/tmp//usr/share/xserver-xorg/pci': No such file or directory                                                    
dh_install: cp -a debian/tmp//usr/share/xserver-xorg/pci debian/virtualbox-ose-guest-x11//usr/share/hal/fdi/policy/20thirdparty/ returned exit code 1
make[1]: *** [override_dh_install] Error 2             
make[1]: Leaving directory `/usr/src/3.2.0-dfsg-1/virtualbox-ose-3.2.0-dfsg'
make: *** [binary] Error 2                             
dpkg-buildpackage: failure: debian/rules binary gave error exit status 2
</log>

i presume this problem does not appear when building for sid or lucid
because GUESTX11_INSTALL is only set to one set of files
(INSTALL_XORGCONFD), where with lenny, GUESTX11_INSTALL is set to two sets
of files (INSTALL_X11_PCI_ID & INSTALL_X11_HAL).

so after educating myself on the finer points of dh_install, i settled on
the approach seen in the attached patch (ie move id-defs to
override_dh_install and change to dh_install calls).

after building and testing my packages i decided to investigate who
inserted that backport-capable code (meskes released the last
lenny-backport, but geyer had a lot of recent entries in debian/changelog)
and how it had evolved (if any) to see if i had overlooked anything and
over-engineered my solution.  i laughed when i browsed the git repository
and saw this commitdiff
(http://git.debian.org/?p=pkg-virtualbox/virtualbox-ose.git;a=commitdiff;h=cd41ece584f269d3868fa49b1409a7f657eb2cda)
because my patch is almost a perfect revert without knowing it when i
created it (though i think mine is optimized because my dh_install calls
don't process debian/virtualbox-ose-guest-x11.install every time because i
use "--ignore debian/$(uxname).install" which i gleaned from bug
#582136 which was filed 24 hours after the git commit, so i had the benefit
of hind-sight).

thanks for maintaining the virtualbox-ose packaging and providing the 90%
solution in backporting virtualbox-ose to lenny; hopefully my patch
provides the remaining 10%.

corey
-- 
undefined at pobox.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: virtualbox-ose_3.2.0-dfsg-1~udo50+1.patch
Type: text/x-diff
Size: 2687 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-virtualbox-devel/attachments/20100605/556fae90/attachment-0001.patch>