[Pkg-virtualbox-commits] r242 - trunk/debian
meskes at alioth.debian.org
meskes at alioth.debian.org
Tue Mar 18 14:24:55 UTC 2008
Author: meskes
Date: 2008-03-18 14:24:54 +0000 (Tue, 18 Mar 2008)
New Revision: 242
Added:
trunk/debian/lynx-dump-postprocess
trunk/debian/virtualbox-ose.README.Debian.xml
Removed:
trunk/debian/virtualbox-ose.README.Debian
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
Log:
Moved to Hilko's docbook version of README.Debian.
Also added information about VBoxADDIF to README.Debian.
Copied lynx-dump-postprocess script from exim4 package.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-15 20:48:45 UTC (rev 241)
+++ trunk/debian/changelog 2008-03-18 14:24:54 UTC (rev 242)
@@ -1,4 +1,4 @@
-virtualbox-ose (1.5.6-dfsg-3) UNRELEASED; urgency=low
+virtualbox-ose (1.5.6-dfsg-3) unstable; urgency=low
[ Michael Meskes ]
* Fixed arch check in virtualbox-ose-source rules file, closes: #469882
@@ -8,12 +8,15 @@
* Replaced $(PWD) with $(CURDIR) in rules file.
* Bumped build dependency for debhelper to version >= 5.0.44~ because of
dh_installifupdown.
+ * Moved to Hilko's docbook version of README.Debian.
+ * Also added information about VBoxADDIF to README.Debian.
+ * Copied lynx-dump-postprocess script from exim4 package.
[ Hilko Bengen ]
* Added scripts for managing `vbox' interfaces from
/etc/network/interfaces
- -- Hilko Bengen <bengen at debian.org> Wed, 12 Mar 2008 22:53:07 +0100
+ -- Michael Meskes <meskes at debian.org> Tue, 18 Mar 2008 15:13:39 +0100
virtualbox-ose (1.5.6-dfsg-2) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2008-03-15 20:48:45 UTC (rev 241)
+++ trunk/debian/control 2008-03-18 14:24:54 UTC (rev 242)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <winnie at debian.org>, Daniel Baumann <daniel at debian.org>, Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 5.0.44~), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm, libpulse-dev, po-debconf (>= 0.5.0)
+Build-Depends: debhelper (>= 5.0.44~), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm, libpulse-dev, po-debconf (>= 0.5.0), docbook-xsl, xsltproc, lynx, docbook-xml
Standards-Version: 3.7.3
Homepage: http://www.virtualbox.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
Added: trunk/debian/lynx-dump-postprocess
===================================================================
--- trunk/debian/lynx-dump-postprocess (rev 0)
+++ trunk/debian/lynx-dump-postprocess 2008-03-18 14:24:54 UTC (rev 242)
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+# taken from the exim4 package
+
+open IN, '<&STDIN';
+#open IN, 'dump';
+{
+ local $/;
+ $content=<IN>;
+}
+close IN;
+
+($title,$body,$links) =
+ ($content =~
+ /^(.*)\n\s+_+\n\n
+ (\s+Table\ of\ Contents.*)
+ (References\n\n\s+1\..*)/sx);
+
+die unless ($title);
+
+print "$title\n".'-' x length($title)."\n\n";
+
+# Sort out local links.
+# The regex might not be entirely accurate.
+foreach (split /\n/, $links) {
+ ($index, $url) = /^\s*(\d+)\. (.+)$/;
+ if ($url !~ /file:\/\/.*#.*$/) {
+ $links[$index] = $url;
+ }
+}
+
+$linkno=0;
+# Split paragraphs
+foreach (split /\n(?:\s+_+\n)?\n/, $body) {
+ my $footnote = '';
+ my $rest = $_;
+ while ( $rest =~ /^(.*?)\[(\d+)\](.*)$/s ) {
+ print $1;
+ if (defined $links[$2]) {
+ $linkno++;
+ print "[$linkno]";
+ $footnote.=" $linkno. $links[$2]\n";
+ }
+ $rest = $3;
+ }
+ print $rest;
+ print "\n\n";
+ if ($footnote ne '') {
+ print "$footnote\n";
+ }
+}
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2008-03-15 20:48:45 UTC (rev 241)
+++ trunk/debian/rules 2008-03-18 14:24:54 UTC (rev 242)
@@ -20,6 +20,19 @@
upstreamversion=$(shell dpkg-parsechangelog | grep Version | cut -d" " -f2 | cut -d"-" -f1)
+# Generate README.Debian as text/html ...
+debian/virtualbox-ose.README.Debian.html: debian/virtualbox-ose.README.Debian.xml
+ xsltproc --nonet --stringparam section.autolabel 1 \
+ -o $@ \
+ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \
+ $<
+
+# ... and text/plain
+debian/virtualbox-ose.README.Debian: debian/virtualbox-ose.README.Debian.html
+ chmod 755 debian/lynx-dump-postprocess
+ (LANG=C; lynx -force_html -dump $< | ./debian/lynx-dump-postprocess > $@.tmp)
+ mv $@.tmp $@
+
env.sh: patch-stamp
dh_testdir
./configure --with-linux="/usr" --disable-kmods
@@ -52,6 +65,7 @@
rm -rf out
rm -f AutoConfig.kmk configure.log env.sh
rm -f debian/$(sname).init debian/$(sname).preinst
+ rm -f debian/README.Debian debian/README.Debian.html
debconf-updatepo
@@ -80,7 +94,7 @@
virtualbox-ose-$(upstreamversion)-dfsg)
# install: DH_OPTIONS=
-install: build
+install: build debian/virtualbox-ose.README.Debian debian/virtualbox-ose.README.Debian.html
dh_testdir
dh_testroot
dh_clean -k
Deleted: trunk/debian/virtualbox-ose.README.Debian
===================================================================
--- trunk/debian/virtualbox-ose.README.Debian 2008-03-15 20:48:45 UTC (rev 241)
+++ trunk/debian/virtualbox-ose.README.Debian 2008-03-18 14:24:54 UTC (rev 242)
@@ -1,46 +0,0 @@
-This Open-Source-Edition contains most but not all features of the innotek Virtualbox product.
-Closed-source features are:
-
-The following list shows the enterprise features that are only present in the closed-source edition. Note that this list may change over time as some of these features will eventually be made available with the open-source version as well.
-
- * Remote Display Protocol (RDP) Server
-
- This component implements a complete RDP server on top of the virtual
- hardware and allows users to connect to a virtual machine remotely using
- any RDP compatible client.
-
- * USB support
-
- VirtualBox implements a virtual USB controller and supports passing through
- USB 1.1 and USB 2.0 devices to virtual machines.
-
- * USB over RDP
-
- This is a combination of the RDP server and USB support allowing users to
- make USB devices available to virtual machines running remotely.
-
- * iSCSI initiator
-
- VirtualBox contains a builtin iSCSI initiator making it possible to use
- iSCSI targets as virtual disks without the guest requiring support for
- iSCSI.
-
- -- Michael Meskes <meskes at debian.org> Thu, 04 Oct 2007 09:23:11 +0200
-
-Due to compatibility issues between version 1.4.0-svn4130 and 1.5.x the configuration files
-are incompatible.
-
-In order to fix this issue please delete the complete
-
- <Uart>
- <Port .... />
- <Port ... />
- </Uart>
-
-section in the xml file.
-
- -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 19 Sep 2007 23:29:32 +0200
-
-Please see also http://wiki.debian.org/VirtualBox for additional information.
-
- -- Michael Meskes <meskes at debian.org> Thu, 01 Nov 2007 14:46:39 +0100
Added: trunk/debian/virtualbox-ose.README.Debian.xml
===================================================================
--- trunk/debian/virtualbox-ose.README.Debian.xml (rev 0)
+++ trunk/debian/virtualbox-ose.README.Debian.xml 2008-03-18 14:24:54 UTC (rev 242)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.docbook.org/xml/4.4/docbookx.dtd">
+<article>
+ <title>Virtualbox OSE for Debian</title>
+ <section>
+ <title>Different versions</title>
+ <para>
+ This Open Source Edition contains most but not all features of
+ the innotek Virtualbox product. Some of the features only
+ present in the closed-source version available from
+ <olink>http://virtualbox.org/wiki/Downloads</olink>:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Remote Display Protocol (RDP) Server
+ </para>
+ <para>
+ This component implements a complete RDP server on top of
+ the virtual hardware and allows users to connect to a
+ virtual machine remotely using any RDP compatible client.
+ </para>
+ </listitem>
+ <listitem>
+ <para>USB support</para>
+ <para>
+ VirtualBox implements a virtual USB controller and supports
+ passing through USB 1.1 and USB 2.0 devices to virtual
+ machines.
+ </para>
+ </listitem>
+ <listitem>
+ <para>USB over RDP</para>
+ <para>
+ This is a combination of the RDP server and USB support
+ allowing users to make USB devices available to virtual
+ machines running remotely.
+ </para>
+ </listitem>
+ <listitem>
+ <para>iSCSI initiator</para>
+ <para>
+ VirtualBox contains a builtin iSCSI initiator making it
+ possible to use iSCSI targets as virtual disks without the
+ guest requiring support for iSCSI.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Emulation for Intel e1000 network device</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section>
+ <title>Networking</title>
+ <para>
+ By default VirtualBox uses NAT for the network interfaces of virtual
+ machines and use an internal DHCP server to obtain an IP address. This
+ works well but the disadvantage is that the machine will not have an IP
+ address visible outside the VM and so you cannot connect to it from the
+ host system or from other systems.
+ </para>
+ <para>
+ By attaching the VM's interface to "Host Interface" and creating a
+ corresponding tun/tap interface the VM can be made visible on the local
+ network.
+ </para>
+ <para>
+ The name for such an interface must start with
+ <code>vbox</code>.
+ </para>
+ <para>
+ There are different ways to create an interface:
+ </para>
+ <section>
+ <title>
+ Using VBoxAddIF
+ </title>
+ <para>
+ In this case you only need to "define" an interface for use by a
+ particular user once. All defined interfaces are "remembered" in the
+ file /etc/vbox/interfaces and recreated by the VirtualBox init script
+ every time the host system is booted.
+ <figure>
+ <title>Configuration of tun/tap interface for VirtualBox</title>
+ <para>
+ <programlisting>
+ VBoxAddIF vbox0 USER br0
+ </programlisting>
+ </para>
+ </figure>
+ </para>
+ <para>
+ You can of course create multiple interfaces per users, but all
+ interfaces should have unique names.
+ </para>
+ </section>
+ <section>
+ <title>
+ Using ifupdown
+ </title>
+ <para>
+ Starting with version 1.5.6-3, the virtualbox-ose package
+ contains helper scripts that allow tap interfaces for
+ host-based networking to be configured from
+ <filename>/etc/network/interfaces</filename>.
+ </para>
+ <para>
+ The owner <!-- and group --> for this interface can be
+ configured using the <code>virtualbox-user</code> <!-- and
+ <code>virtualbox-group</code>keywords respectively.-->
+ keyword.
+ <figure>
+ <title>Configuration of tun/tap interface for VirtualBox</title>
+ <para>
+ <programlisting>
+iface vbox0 inet static
+ address 192.168.3.1
+ netmask 255.255.255.0
+ virtualbox-user USER
+<!-- #virtualbox-group vboxusers -->
+ </programlisting>
+ </para>
+ </figure>
+ </para>
+ </section>
+ </section>
+ <section>
+ <title>Incompatibilities with previous versions</title>
+ <para>
+ Unfortunately, the configuration files between version version
+ 1.4.0-svn4130 and 1.5.0 the configuration files are
+ incompatible.
+ </para>
+ <para>
+ In order to fix this issue please delete the complete
+ <![CDATA[<Uart>]]> section in your
+ <filename>~/.VirtualBox/Machines/NAME/NAME.xml</filename> file.
+ </para>
+ </section>
+ <section>
+ <title>Additional information</title>
+ <para>
+ Please see the
+ <ulink url="http://wiki.debian.org/VirtualBox">VirtualBox page</ulink>
+ in the Debian Wiki for additional or updated information.
+ </para>
+ </section>
+</article>
More information about the Pkg-virtualbox-commits
mailing list