UBUNTU: [Debian] ubuntu: vbox -- elide the new symlinks and reconstruct on clean

BugLink: http://bugs.launchpad.net/bugs/1426113
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules b/debian/rules
index 242354ddc50be90efbedd4b21d209021472412ec..21324eb99ea75c0a2d53595bdc497eeb5cbafd11 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,9 @@ clean: debian/control
        # Install the copyright information.
        cp $(DEBIAN)/copyright debian/copyright
 
+       # If we have a reconstruct script use it.
+       [ -f $(DEBIAN)/reconstruct ] && bash -x $(DEBIAN)/reconstruct
+
 distclean: clean
        rm -rf $(DROOT)/control $(DROOT)/control.stub $(DEBIAN)/control.stub \
                $(DEBIAN)/d-i/kernel-versions debian/changelog \

diff --git a/debian/source/options b/debian/source/options
index 8e1f8cf5b05dd67e9b2cd1b64035e41592cf20c6..90c83e2ab28fd296eb88f825df797de84305c405 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,3 +1,10 @@
+# Ignore vbox symlinks, we will regenerate these at clean (LP:1426113)
+extend-diff-ignore=ubuntu/vbox/vboxvideo/include
+extend-diff-ignore=ubuntu/vbox/vboxguest/r0drv
+extend-diff-ignore=ubuntu/vbox/vboxguest/include
+extend-diff-ignore=ubuntu/vbox/vboxsf/r0drv
+extend-diff-ignore=ubuntu/vbox/vboxsf/include
+
 # force "dpkg-source -I -i" behavior
 diff-ignore
 tar-ignore