[Pkg-virtualbox-commits] [virtualbox] 01/03: Add VNC plugin module.

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository virtualbox.

commit 0b6448889f02d72fe8982043bff18f342246021e
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Aug 25 12:03:00 2013 +0200

    Add VNC plugin module.
    
    * Add VNC plugin module.
      - debian/patches/36-fix-vnc-version-string.patch: fix version string.
---
 debian/changelog                               |    8 ++++++++
 debian/patches/36-fix-vnc-version-string.patch |   21 +++++++++++++++++++++
 debian/patches/series                          |    1 +
 debian/virtualbox.install                      |    1 +
 4 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index afce454..e9b5c71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (4.2.16-dfsg-2) UNRELEASED; urgency=low
+
+  [ Whoopie ]
+  * Add VNC plugin module.
+    - debian/patches/36-fix-vnc-version-string.patch: fix version string.
+
+ -- Felix Geyer <fgeyer at debian.org>  Fri, 23 Aug 2013 23:57:37 +0200
+
 virtualbox (4.2.16-dfsg-1) unstable; urgency=high
 
   [ Felix Geyer ]
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
new file mode 100644
index 0000000..82e2d53
--- /dev/null
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -0,0 +1,21 @@
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -2339,6 +2339,7 @@
+ 	-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
+ 	-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+ 	-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
++	-e 's/@VBOX_VERSION_STRING_RAW@/$(VBOX_VERSION_STRING_RAW)/g' \
+ 	-e 's/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g' \
+ 	-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+ 	-e 's/@VBOX_VENDOR_SHORT@/$(VBOX_VENDOR_SHORT)/g' \
+--- a/src/VBox/ExtPacks/VNC/ExtPack.xml
++++ b/src/VBox/ExtPacks/VNC/ExtPack.xml
+@@ -2,7 +2,7 @@
+ <VirtualBoxExtensionPack xmlns="http://www.virtualbox.org/VirtualBoxExtensionPack" version="1.0">
+     <Name>VNC</Name>
+     <Description>VNC plugin module</Description>
+-    <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version>
++    <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING_RAW@</Version>
+     <MainModule>VBoxVNCMain</MainModule>
+     <VRDEModule>VBoxVNC</VRDEModule>
+     <ShowLicense/>
diff --git a/debian/patches/series b/debian/patches/series
index 32a41e5..3627f35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 30-usb-warning-filters.patch
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
+36-fix-vnc-version-string.patch
diff --git a/debian/virtualbox.install b/debian/virtualbox.install
index ad7789b..1612e66 100644
--- a/debian/virtualbox.install
+++ b/debian/virtualbox.install
@@ -1,6 +1,7 @@
 debian/virtualbox.files/*.sh /usr/share/virtualbox
 
 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*.gc /usr/lib/virtualbox

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