Merging debian version 7.0.16-dfsg-8.

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

6 files changed, 37 insertions, 29 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index b37b2b48..00000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-virtualbox (5.0.10-dfsg-6) unstable; urgency=medium
-
-  * A new vboxweb.service Web Service has been added, running vboxwebsrv.
-    the service is disabled by default, so it needs to be enabled manually with
-    systemctl enable vboxweb and systemctl start vboxweb.
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 10 Dec 2015 11:21:32 +0100
-
diff --git a/debian/changelog b/debian/changelog
index ff07d94f..b4f30928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+virtualbox (7.0.16-dfsg-8) unstable; urgency=medium
+
+  * Drop dh_installsystemd.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 May 2024 09:43:22 +0200
+
+virtualbox (7.0.16-dfsg-7) unstable; urgency=medium
+
+  * replace dh_systemd_enable with dh_installsystemd
+  * Drop old lintian override
+  * Drop priority optional, useless. Move package to contrib/oldlibs instead of just oldlibs
+  * Drop X-Python-Version
+  * Drop NEWS file
+  * Fix duplicate long description
+  * Fix duplicate short description
+  * Drop debug symbols migration code.
+  * Bump compat level to 13
+  * Drop trailing whitespace
+  * Bump std-version to 4.7.0
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 May 2024 08:46:00 +0200
+
 virtualbox (7.0.16-dfsg-6~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
@@ -168,7 +190,7 @@ virtualbox (7.0.12-dfsg-1) unstable; urgency=medium
 
   * New upstream version 7.0.12-dfsg
   * Refresh patches
-  * Drop patches now part of upstream codebase: 
+  * Drop patches now part of upstream codebase:
     {100436,100653,100677,100799,100800,
     virtualbox-modules-7.0.10-kernel-6.4.10}.patch
 
diff --git a/debian/control b/debian/control
index f389aaa6..17906991 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XSBC-Original-Uploaders: Ritesh Raj Sarraf <rrs@debian.org>,
            Gianfranco Costamagna <locutusofborg@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Build-Depends: bzip2,
-               debhelper-compat (= 12),
+               debhelper-compat (= 13),
                default-jdk,
                jaxws,
                dh-python,
@@ -80,8 +80,7 @@ Build-Depends: bzip2,
                xsltproc,
                yasm,
                zlib1g-dev
-X-Python-Version: >= 2.5
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
 Rules-Requires-Root: binary-targets
 Homepage: https://www.virtualbox.org
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/virtualbox
@@ -159,7 +158,7 @@ Section: contrib/kernel
 Architecture: amd64
 Depends: build-essential,
          bzip2,
-         debhelper-compat (= 12),
+         debhelper-compat (= 13),
          kbuild,
          module-assistant,
          ${misc:Depends}
@@ -222,19 +221,19 @@ Description: x86 virtualization solution - non-X11 guest utilities
  between the host system and the virtual machine.
 
 Package: virtualbox-guest-x11-hwe
-Section: oldlibs
-Priority: optional
+Section: contrib/oldlibs
 Architecture: amd64 i386
 Depends: virtualbox-guest-x11,
          ${misc:Depends}
-Description: transitional package
- This is a transitional package. It can safely be removed
+Description: transitional package for virtualbox-guest-x11
+ This is a transitional package for virtualbox-guest-x11.
+ It can safely be removed
 
 Package: virtualbox-guest-utils-hwe
-Section: oldlibs
-Priority: optional
+Section: contrib/oldlibs
 Architecture: amd64 i386
 Depends: virtualbox-guest-utils,
          ${misc:Depends}
-Description: transitional package
- This is a transitional package. It can safely be removed
+Description: transitional package for virtualbox-guest-utils
+ This is a transitional package for virtualbox-guest-utils.
+ It can safely be removed
diff --git a/debian/rules b/debian/rules
index ae1eec54..f720ba0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,15 +163,12 @@ override_dh_installinit:
 	dh_installinit -p$(uxname) --no-start --update-rcd-params="start 45 S ."
 	dh_installinit --remaining-packages --no-start
 
-override_dh_systemd_enable:
-	dh_systemd_enable -p$(uname) debian/$(uname).service
-
 override_dh_dkms:
 	dh_dkms -V $(VERSION)
 
 override_dh_strip:
 ifneq (,$(filter $(sname), $(shell dh_listpackages)))
-	dh_strip --dbgsym-migration='$(sname)-dbg'
+	dh_strip
 
 	# strip files not handled by dh_strip
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 9999d716..00000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-virtualbox source: ancient-autotools-helper-file src/VBox/RDP/client-1.8.3/config.sub 2003-06-18
-virtualbox source: ancient-autotools-helper-file src/VBox/RDP/client-1.8.3/config.guess 2003-06-17
diff --git a/debian/virtualbox-source.files/control.modules.in b/debian/virtualbox-source.files/control.modules.in
index 0366dcd2..7e887b31 100644
--- a/debian/virtualbox-source.files/control.modules.in
+++ b/debian/virtualbox-source.files/control.modules.in
@@ -7,8 +7,8 @@ XSBC-Original-Maintainer: Debian Virtualbox Team <team+debian-virtualbox@tracker
 XSBC-Original-Uploaders: Ritesh Raj Sarraf <rrs@debian.org>,
            Gianfranco Costamagna <locutusofborg@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 12), kbuild
-Standards-Version: 4.6.1
+Build-Depends: debhelper-compat (= 13), kbuild
+Standards-Version: 4.7.0
 Homepage: https://www.virtualbox.org
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/virtualbox
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/virtualbox