Adding debian version 7.0.18-dfsg-1.debian/7.0.18-dfsg-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 18 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index 44d255e6..aa8cfe7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+virtualbox (7.0.18-dfsg-1) unstable; urgency=medium
+
+  * New upstream version 7.0.18-dfsg
+  * Fixup link for tarball import
+  * Drop patch 162843, upstream. Refresh vnc patch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 May 2024 16:44:26 +0200
+
+virtualbox (7.0.16-dfsg-9) unstable; urgency=medium
+
+  * Drop old NEWS file
+  * Update dependency of libgl1-mesa-dev
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 May 2024 11:29:23 +0200
+
 virtualbox (7.0.16-dfsg-8) unstable; urgency=medium
 
   * Drop dh_installsystemd.
diff --git a/debian/control b/debian/control
index 16ebc793..928cc91c 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: bzip2,
                libdevmapper-dev,
                libdrm-dev,
                libegl1-mesa-dev,
-               libgl1-mesa-dev,
+               libgl-dev,
                libglu1-mesa-dev,
                libgsoap-dev,
                liblzf-dev,
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 836a1834..2a0640e3 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -70,4 +70,4 @@ tar --exclude .svn --exclude '.git*' --exclude debian --directory ${WORKING_DIR}
 rm -rf ${ORIG_TARBALL_DIR}
 
 echo "Done, now you can run:"
-echo "gbp import-orig ../${DEST_TARBALL_NAME}"
+echo "gbp import-orig ${DEST_TARBALL_NAME}"
diff --git a/debian/patches/162843.patch b/debian/patches/162843.patch
deleted file mode 100644
index 6652320d..00000000
--- a/debian/patches/162843.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: /branches/VBox-7.0/src/VBox/Devices/Network/SrvIntNetR0.cpp
-===================================================================
---- a/src/VBox/Devices/Network/SrvIntNetR0.cpp	(revision 162842)
-+++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp	(revision 162843)
-@@ -2936,5 +2936,5 @@
-     union
-     {
--        uint8_t     abBuf[sizeof(INTNETSG) + sizeof(INTNETSEG)];
-+        uint8_t     abBuf[sizeof(INTNETSG) + 2 * sizeof(INTNETSEG)];
-         INTNETSG    SG;
-     } u;
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 694b6573..fe1a09ec 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- virtualbox.orig/Config.kmk
 +++ virtualbox/Config.kmk
-@@ -3859,6 +3859,7 @@
+@@ -3862,6 +3862,7 @@
  	-e 's+@VBOX_VERSION_MINOR@+$(VBOX_VERSION_MINOR)+g' \
  	-e 's+@VBOX_VERSION_BUILD@+$(VBOX_VERSION_BUILD)+g' \
  	-e 's+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g' \
diff --git a/debian/patches/series b/debian/patches/series
index f13ae574..07cab078 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 37-do-not-run-if-not-in-vm.patch
-162843.patch
diff --git a/debian/virtualbox.docs b/debian/virtualbox.docs
index 81f52108..9c7cebde 100644
--- a/debian/virtualbox.docs
+++ b/debian/virtualbox.docs
@@ -1,3 +1,2 @@
 debian/README.Debian.html
-debian/virtualbox.files/NEWS.Debian
 out/bin/UserManual.*
diff --git a/debian/virtualbox.files/NEWS.Debian b/debian/virtualbox.files/NEWS.Debian
deleted file mode 100644
index 65411b84..00000000
--- a/debian/virtualbox.files/NEWS.Debian
+++ /dev/null
@@ -1,25 +0,0 @@
-virtualbox-ose (3.1.4-dfsg-2) unstable; urgency=low
-
-  virtualbox-ose no longer depends on QT4 to not force anyone to install QT4
-  even if the virtualbox-ose provided gui is not installed. However, QT4 is still
-  recommended because there is one little utility in virtualbox-ose that is
-  linked againbt QT4. This utility, VBoxTestOGL, is used to test for OpenGL
-  capabilities. So if you use OpenGL you might want to install QT4 nonetheless.
-  If you know your OpenGL capabilities you can of course also replace VBoxTestOGL
-  by /bin/true or /bin/false depending on your capabilities.
-
- -- Michael Meskes <meskes@debian.org>  Mon, 15 Feb 2010 20:53:12 +0100
- 
-virtualbox-ose (2.0.6-dfsg-1) experimental; urgency=low
-
-  The way Host Interface Networking works has been completely rewritten with
-  VirtualBox 2. The main difference is that the complex bridging configuration
-  is no longer necessary. With the new mechanism, to enable Host Interface
-  Networking, all you need to do is to open the Settings dialog of a virtual
-  machine, go to the “Network” page and select “Host Interface” in the drop down
-  list for the “Attached to” field. Finally, select the desired host interface
-  from the list at the bottom of the page, which contains the physical network
-  interfaces.
-
- -- Michael Meskes <meskes@debian.org>  Thu, 20 Nov 2008 14:09:54 +0100
-