Changeset 107369 in vbox

Timestamp:

Dec 18, 2024 8:57:56 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166407

Message:

debian/*: back out previous change

File:

• trunk/debian/rules (modified) (2 diffs)

trunk/debian/rules

@@ -269 +269 @@
             fi \
             done)
-        dh_installdocs $(addprefix $(archdir)/,UserManual*.pdf UserManual*.qch UserManual*.qhc LICENSE)
-        # Remove User Manual duplicated files, only keep them under location which was used by dh_installdocs.
-        rm -f $(addprefix $(archdir)/,UserManual*.pdf UserManual*.qch UserManual*.qhc LICENSE)
+        dh_installdocs $(addprefix $(archdir)/,UserManual*.pdf LICENSE)
         mv $(addprefix $(archdir)/,additions/VBoxGuestAdditions.iso) $(prefix)/usr/share/$(package)
         mv $(archdir) $(prefix)/usr/lib/$(package)
-        if [ -f $(prefix)/usr/lib/$(package)/libQt6CoreVBox.so.6 ]; then \
+        if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
             $(vboxroot)/tools/linux.$(chrarch)/bin/chrpath \
                 --keepgoing --replace /usr/lib/$(package) \
-                $(prefix)/usr/lib/$(package)/*.so.6 \
+                $(prefix)/usr/lib/$(package)/*.so.5 \
                 $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
                 $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
                 $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
                 $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
             echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
             echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \
         fi
         export VBOX_INSTALL_PATH=/usr/lib/$(package) && \
-            cd $(builddir)/bin/sdk/installer/python && \
+            cd $(builddir)/bin/sdk/installer && \
             $(PYTHON) ./vboxapisetup.py install --root $(prefix)
         rm -rf $(prefix)/usr/lib/$(package)/sdk/installer
@@ -320 +319 @@
   ifeq ($(DEBUG),)
         dh_strip --keep-debug \
-            $(addprefix --exclude=lib,$(addsuffix VBox.so.6,\
-              Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6DBus Qt6Xml Qt6XcbQpa Qt6Help Qt6Network Qt6Sql))
+            $(addprefix --exclude=lib,$(addsuffix VBox.so.5,\
+              Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras))
   endif
         mkdir -p $(bldbase)/$(verpkg)-dbg/usr/lib/$(package)