[Pkg-virtualbox-commits] r293 - in trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-06-06 11:18:02 +0000 (Fri, 06 Jun 2008)
New Revision: 293

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/08-init-lsb.dpatch
   trunk/debian/rules
Log:
Adjusted one patch to latest release.
Build with gcc/g++ 4.2.
Bumped Standards-Version to 3.8.0.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-03 15:54:53 UTC (rev 292)
+++ trunk/debian/changelog	2008-06-06 11:18:02 UTC (rev 293)
@@ -1,11 +1,13 @@
-virtualbox-ose (1.6.2-dfsg-1) UNRELEASED; urgency=low
+virtualbox-ose (1.6.2-dfsg-1) unstable; urgency=low
 
   [ Michael Meskes ]
   * New upstream version, closes: #479744, #482504
   * Removed unneeded xalan build dependency.
   * Added build dependency on libxslt and libxml.
   * Fixed LocalConfig.kmk to list new variables.
-  * Use upstream provided X session file, put patch our changes in there.
+  * Use upstream provided X session file, but patch our changes in there.
+  * Build with gcc/g++ 4.2.
+  * Bumped Standards-Version to 3.8.0.
 
   [ Daniel Baumann ]
   * Removing ffmpeg recursively in dfsg-free target in rules.

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-06-03 15:54:53 UTC (rev 292)
+++ trunk/debian/control	2008-06-06 11:18:02 UTC (rev 293)
@@ -3,8 +3,8 @@
 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, libxslt1-dev, uuid-dev, yasm (>= 0.7.0), libpulse-dev, po-debconf (>= 0.5.0), docbook-xsl, xsltproc, lynx, docbook-xml
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.44~), dpatch, bcc, bzip2, g++-4.2-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxslt1-dev, uuid-dev, yasm (>= 0.7.0), libpulse-dev, po-debconf (>= 0.5.0), docbook-xsl, xsltproc, lynx, docbook-xml, gcc-4.2, g++-4.2
+Standards-Version: 3.8.0
 Homepage: http://www.virtualbox.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk

Modified: trunk/debian/patches/08-init-lsb.dpatch
===================================================================
--- trunk/debian/patches/08-init-lsb.dpatch	2008-06-03 15:54:53 UTC (rev 292)
+++ trunk/debian/patches/08-init-lsb.dpatch	2008-06-06 11:18:02 UTC (rev 293)
@@ -14,12 +14,10 @@
  # Provides:       vboxnet
 -# Required-Start: $network
 -# Required-Stop:
--# Default-Start:  3 5
--# Default-Stop:
 +# Required-Start: $remote_fs $network
 +# Required-Stop:  $remote_fs
-+# Default-Start:  2 3 4 5
-+# Default-Stop:   0 1 6
+ # Default-Start:  2 3 4 5
+ # Default-Stop:   0 1 6
  # Description:    VirtualBox permanent host networking setup
  ### END INIT INFO
  

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-06-03 15:54:53 UTC (rev 292)
+++ trunk/debian/rules	2008-06-06 11:18:02 UTC (rev 293)
@@ -35,7 +35,7 @@
 
 env.sh: patch-stamp
 	dh_testdir
-	./configure --with-linux="/usr" --disable-kmods
+	./configure --with-linux="/usr" --disable-kmods --with-gcc=/usr/bin/gcc-4.2 --with-g++=/usr/bin/g++-4.2
 	if [ "`dpkg --print-architecture`" = "i386" ]; then \
 		echo "VBOX_WITH_X11_ADDITIONS=1" >> LocalConfig.kmk; \
 	else \