Changeset 41036 in vbox

Timestamp:

Apr 24, 2012 7:55:07 AM (12 years ago)

Author:

vboxsync

Message:

deb/rpm: use self-compiled libQt4 for older Linux distributions as we now depend on Qt 4.6.2 or newer

Location:

trunk

Files:

trunk/debian/lintian-override.in

-              r36782
+              r41036
 %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

r40390	r41036
73	73
74	74	cfg_flags := $(if $(NOQT),--disable-qt,) \
75		$(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
	75	$(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
76	76	$(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
77	77	$(if $(HEADLESS),--build-headless,) \

r40217	r41036
30	30	VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
31	31	VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS)
32

r40390	r41036
95	95
96	96	cfg_flags := $(if $(NOQT),--disable-qt,) \
97		$(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
	97	$(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
98	98	$(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
99	99	$(if $(HEADLESS),--build-headless,) \

r40660	r41036
136	136	$(if $(filter sles10.1 turbolinux11,$(rpmrel)),--disable-pulse,) \
137	137	$(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
138		$(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 ~~sles10.1~~ turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
	138	$(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 mdv2010.0-amd64 sles10.1 sles11.0 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
139	139	$(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
140	140	$(if $(HEADLESS),--build-headless,) \

Note: See TracChangeset for help on using the changeset viewer.