[Pkg-virtualbox-commits] [virtualbox] 02/05: Drop useless part of the xorg patch, remove x11stubs and x11includes from next repack (upstream ticket 16052)

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 28a2557b358e9d29824dd8b643a30ce250862361
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Dec 1 09:07:20 2016 +0100

    Drop useless part of the xorg patch, remove x11stubs and x11includes from next repack (upstream ticket 16052)
---
 debian/get-orig-source.sh          |  4 ++--
 debian/patches/new-xorg-1.19.patch | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index eca8316..239fe58 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -44,8 +44,8 @@ rm -fr ${ORIG_TARBALL_DIR}/src/libs/libxml2*
 rm -fr ${ORIG_TARBALL_DIR}/src/libs/libxslt*
 rm -fr ${ORIG_TARBALL_DIR}/src/libs/zlib*
 rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Additions/linux/selinux-fedora
-find   ${ORIG_TARBALL_DIR}/src/VBox/Additions/x11/x11include -mindepth 1 -maxdepth 1 \
-   -type d ! -name '*mesa-*' -exec rm -rf {} \;
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Additions/x11/x11include
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Additions/x11/x11stubs
 rm -fr ${ORIG_TARBALL_DIR}/src/libs/kStuff/kStuff/kLdr/testcase/bin
 rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDxe/Ebc/Fat.efi
 rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
diff --git a/debian/patches/new-xorg-1.19.patch b/debian/patches/new-xorg-1.19.patch
index 2389b8d..65d73b6 100644
--- a/debian/patches/new-xorg-1.19.patch
+++ b/debian/patches/new-xorg-1.19.patch
@@ -77,22 +77,6 @@ Index: virtualbox/src/VBox/Additions/x11/Makefile.kmk
   endif
  endif
  
-Index: virtualbox/src/VBox/Additions/x11/x11include/mesa-7.2/README
-===================================================================
---- virtualbox.orig/src/VBox/Additions/x11/x11include/mesa-7.2/README
-+++ virtualbox/src/VBox/Additions/x11/x11include/mesa-7.2/README
-@@ -2,10 +2,6 @@
- and executing
- 
- $ mkdir $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
--$ for i in `find include src/mesa -name '*.h' | grep -v src/mesa/drivers` \
--           `find src/mesa/drivers/dri/common -name '*.h'`
--    do
--      cp --parents $i $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
--    done
-+$ cp -r include/GL $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
- 
- in the mesa-7.2 directory.
 Index: virtualbox/src/VBox/GuestHost/OpenGL/Makefile.kmk
 ===================================================================
 --- virtualbox.orig/src/VBox/GuestHost/OpenGL/Makefile.kmk

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git