Changeset 96795 in vbox

Timestamp:

Sep 19, 2022 4:42:57 PM (2 years ago)

Author:

vboxsync

Message:

rpm and deb packaging: move UserManual files in correct place.

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)

trunk/src/VBox/Installer/linux/debian/rules

@@ -293 +293 @@
             fi \
             done)
-        dh_installdocs $(addprefix $(archdir)/,UserManual*.pdf LICENSE)
+        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)
         mv $(addprefix $(archdir)/,additions/VBoxGuestAdditions.iso) $(prefix)/usr/share/$(package)
         mv $(archdir) $(prefix)/usr/lib/$(package)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -203 +203 @@
 %{!?is_ose: mv LICENSE $RPM_BUILD_ROOT%{VBOXDOCDIR}}
 mv UserManual*.pdf $RPM_BUILD_ROOT%{VBOXDOCDIR}
-%{?with_qhelp: mv VirtualBox*.qch VirtualBox*.qhc $RPM_BUILD_ROOT%{VBOXDOCDIR}}
+%{?with_qhelp: mv UserManual*.qch UserManual*.qhc $RPM_BUILD_ROOT%{VBOXDOCDIR}}
 install -m 755 -d $RPM_BUILD_ROOT/usr/lib/debug/usr/lib/virtualbox
 %if %{?rpm_suse:1}%{!?rpm_suse:0}