Changeset 45933 in vbox

Timestamp:

May 7, 2013 12:28:18 PM (12 years ago)

Author:

vboxsync

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

85572

Message:

deb: sync

Location:

trunk/debian

Files:

• lintian-override.in (modified) (3 diffs)
• rules (modified) (2 diffs)

trunk/debian/lintian-override.in

@@ -10 +10 @@
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxXPCOMC.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedFolders.so
-%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDragAndDropSvc.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestPropSvc.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestControlSvc.so
+%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHostChannel.so
+%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDragAndDropSvc.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so
 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVRDP.so
@@ -61 +62 @@
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxXPCOM.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxSharedFolders.so
-%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxDragAndDropSvc.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxSharedClipboard.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxGuestPropSvc.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxGuestControlSvc.so
+%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxHostChannel.so
+%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxDragAndDropSvc.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxVRDP.so
 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxAuth.so
@@ -74 +76 @@
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestPropSvc.so /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestControlSvc.so /usr/lib/virtualbox
+%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHostChannel.so /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHeadless /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHeadless.so /usr/lib/virtualbox

trunk/debian/rules

@@ -72 +72 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
+             $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \
@@ -95 +95 @@
              $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
-             $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),)
 
 configure: debian/configure-stamp