summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2012-04-24 07:55:07 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2012-04-24 07:55:07 +0000
commitfcc7cbe5ed785b6c791445be9b8c26e96f5a2e11 (patch)
tree60c4fda13d415c8bc795dd2cd235e5e81801f2df /debian
parent72ef3a9e78158cd282cc041a8349cb09434990a6 (diff)
downloadVirtualBox-svn-fcc7cbe5ed785b6c791445be9b8c26e96f5a2e11.tar.gz
deb/rpm: use self-compiled libQt4 for older Linux distributions as we now depend on Qt 4.6.2 or newer
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@41036 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'debian')
-rw-r--r--debian/lintian-override.in12
-rwxr-xr-xdebian/rules2
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/lintian-override.in b/debian/lintian-override.in
index 9d4cbcb07bc..52c36a409db 100644
--- a/debian/lintian-override.in
+++ b/debian/lintian-override.in
@@ -43,12 +43,12 @@
%VERPKG%: binary-without-manpage usr/bin/vboxsdl
%VERPKG%: binary-without-manpage usr/bin/vboxwebsrv
%VERPKG%: binary-without-manpage usr/bin/virtualbox
-%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDGC.gc
-%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2GC.gc
-%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDR0.r0
-%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2R0.r0
-%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VMMGC.gc
-%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VMMR0.r0
+%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDGC.gc
+%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2GC.gc
+%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
+%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
+%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VMMGC.gc
+%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxRT.so
%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxDD.so
%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxDD2.so
diff --git a/debian/rules b/debian/rules
index cc229910be2..ffd4f308b4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ instmod := $(if $(filter _Ubuntu_lucid _Ubuntu_maverick _Ubuntu_natty _Ubuntu_on
qtstdc6 := /home/vbox/Qt-4.7.4-stdc++6-$(arch)
cfg_flags := $(if $(NOQT),--disable-qt,) \
- $(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
+ $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
$(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
$(if $(HEADLESS),--build-headless,) \
$(if $(DEBUG),--build-debug,) \