[Pkg-virtualbox-devel] patch for bug 721786

[Ritesh Raj Sarraf]

On Friday 13 September 2013 09:57 PM, Ritesh Raj Sarraf wrote:
> Hello Felix,
>
> I've prepared the patch for this issue (attached). VBox has become a
> necessity in my workflow. It'd be really helpful if you could review and
> make a release.

What is your build workflow? I try the basic gbp steps but it fails
saying there are local changes.


root at ibmx3650m2-210-147:~/git/virtualbox# gbp buildpackage
--git-pbuilder --git-ignore-new
............snipped..................
 dpkg-source -b virtualbox
dpkg-source: info: using options from
virtualbox/debian/source/local-options: --unapply-patches
--abort-on-upstream-changes --tar-ignore=debian/gbp.conf
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building virtualbox using existing
./virtualbox_4.2.16-dfsg.orig.tar.xz
dpkg-source: warning: ignoring deletion of directory
src/VBox/Devices/EFI/tools/include/Protocol
dpkg-source: warning: ignoring deletion of directory
src/VBox/Devices/EFI/tools/include/Guid
dpkg-source: warning: ignoring deletion of directory
src/VBox/Devices/Network/win
dpkg-source: warning: ignoring deletion of directory
src/VBox/Storage/VDFormats
dpkg-source: warning: ignoring deletion of directory src/VBox/Debugger/win32
dpkg-source: warning: ignoring deletion of directory
src/VBox/Installer/darwin/VirtualBoxCLI
dpkg-source: warning: ignoring deletion of directory
src/VBox/Installer/linux/helpers
dpkg-source: warning: ignoring deletion of directory
src/VBox/Additions/linux/lightdm-greeter/liblightdm-gobject-1.5.0/lightdm
dpkg-source: warning: ignoring deletion of directory
src/libs/kStuff/kStuff/kTable
dpkg-source: warning: ignoring deletion of directory
src/libs/kStuff/kStuff/kTable/testcase
dpkg-source: warning: ignoring deletion of directory
src/libs/xpcom18a4/python/sample
dpkg-source: warning: ignoring deletion of directory
src/libs/xpcom18a4/java/src/org/mozilla/xpcom/intrefaces
dpkg-source: info: local changes detected, the modified files are:
 virtualbox/Config.kmk
 virtualbox/configure
 virtualbox/include/VBox/VDEPlugSymDefs.h
 virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
 virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
 virtualbox/src/VBox/Additions/linux/Makefile.kmk
 virtualbox/src/VBox/Additions/linux/sharedfolders/dirops.c
 virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient
 virtualbox/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
 virtualbox/src/VBox/Devices/Network/DrvIntNet.cpp
 virtualbox/src/VBox/ExtPacks/VNC/ExtPack.xml
 virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 virtualbox/src/VBox/HostDrivers/Support/linux/Makefile
 virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
 virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
 virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile
 virtualbox/src/VBox/Installer/linux/Makefile.include.header
 virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
 virtualbox/src/VBox/VMM/VMMR3/VM.cpp
dpkg-source: error: aborting due to unexpected upstream changes, see
/tmp/virtualbox_4.2.16-dfsg-3.diff.ijI9VJ
dpkg-source: info: you can integrate the local changes with dpkg-source
--commit
dpkg-buildpackage: error: dpkg-source -b virtualbox gave error exit status 2
gbp:error: Couldn't run 'git-pbuilder': git-pbuilder returned 2


-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 897 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-virtualbox-devel/attachments/20130913/f75b171f/attachment.sig>