[Pkg-virtualbox-commits] [virtualbox] 05/05: Revert something

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit a48c50867afc2c493aec9d2b4f1ee7308e8fc1ab
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jul 14 15:51:32 2015 +0200

    Revert something
---
 debian/changelog                    | 10 +---------
 debian/rules                        |  7 +++----
 debian/virtualbox.install           |  2 +-
 debian/virtualbox.lintian-overrides |  8 +++-----
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4da3739..539f6db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,17 +8,9 @@ virtualbox (4.3.30-dfsg-1) unstable; urgency=medium
     gcc-4.9 workaround (d/{rules,control})
   * Update copyright file.
   * Patch refresh.
-  * remove obsolete lintian overrides.
-  * add some wrongly removed lintian overrides.
-  * Add VBoxDTrace not linked against libc lintian override.
-    It seems to really not use libc symbols.
-  * d/rules: remove VBoxDTraceR0.debug and strip VBoxDTraceR0.r0
-    files.
-  * d/rules: sed .gc to .rc (following upstream rename change)
-  * update d/source.lintian-overrides file.
   * Remove some more windows prebuilt files.
   * Add libnotify-bin as runtime-dependency for the x11 package
-   (used for notify-send command) (Closes: #792292)
+    (used for notify-send command) (Closes: #792292)
     - Thanks Torquil Macdonald Sørensen for the useful and complete
       bug report.
 
diff --git a/debian/rules b/debian/rules
index 83fbae7..85ad4ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,7 @@ override_dh_fixperms:
 	chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetAdpCtl
 	chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox
 
-	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.rc
+	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.gc
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.r0
 
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py
@@ -173,14 +173,13 @@ override_dh_strip:
 
 	# strip files not handled by dh_strip
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	set -e && for file in debian/$(sname)/usr/lib/virtualbox/*.rc debian/$(sname)/usr/lib/virtualbox/*.r0 debian/$(sname)/usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/*.r0; do \
+	set -e && for file in debian/$(sname)/usr/lib/virtualbox/*.gc debian/$(sname)/usr/lib/virtualbox/*.r0; do \
 	    strip --strip-debug --remove-section=.comment --remove-section=.note $${file}; \
 	done
 endif
 	# I don't see a reason to have these. If any user complains, we can try ship it.
-	rm -f debian/$(sname)/usr/lib/virtualbox/VMMRC.debug
+	rm -f debian/$(sname)/usr/lib/virtualbox/VMMGC.debug
 	rm -f debian/$(sname)/usr/lib/virtualbox/VMMR0.debug
-	rm -f debian/$(sname)/usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceR0.debug
 
 override_dh_shlibdeps:
 	dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \
diff --git a/debian/virtualbox.install b/debian/virtualbox.install
index 7eee01c..1612e66 100644
--- a/debian/virtualbox.install
+++ b/debian/virtualbox.install
@@ -4,7 +4,7 @@ out/bin/components /usr/lib/virtualbox
 out/bin/ExtensionPacks /usr/lib/virtualbox
 out/bin/VBoxREM.so /usr/lib/virtualbox
 out/bin/VBox*.so /usr/lib/virtualbox
-out/bin/VBox*.rc /usr/lib/virtualbox
+out/bin/VBox*.gc /usr/lib/virtualbox
 out/bin/VBox*.r0 /usr/lib/virtualbox
 out/bin/VBoxAutostart /usr/lib/virtualbox
 out/bin/VBoxBalloonCtrl /usr/lib/virtualbox
diff --git a/debian/virtualbox.lintian-overrides b/debian/virtualbox.lintian-overrides
index e2e14a8..95bd216 100644
--- a/debian/virtualbox.lintian-overrides
+++ b/debian/virtualbox.lintian-overrides
@@ -6,17 +6,15 @@ virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxRT.so
 virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.so
 virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
 virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2RC.rc
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2GC.gc
 virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDRC.rc
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDGC.gc
 virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMRC.rc
+virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMGC.gc
 virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
-virtualbox: unstripped-binary-or-object usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceR0.r0
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxHeadless 6755 root/root
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetAdpCtl 6755 root/root
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetDHCP 6755 root/root
 virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxSDL 6755 root/root
 virtualbox: jar-not-in-usr-share usr/lib/virtualbox/sdk/bindings/xpcom/java/vboxjxpcom.jar
 virtualbox: embedded-library usr/lib/virtualbox/VBoxXPCOM.so: nspr
-virtualbox: library-not-linked-against-libc usr/lib/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/VBoxDTraceMain.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git