[Pkg-virtualbox-commits] r255 - trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-04-24 09:54:02 +0000 (Thu, 24 Apr 2008)
New Revision: 255

Removed:
   trunk/debian/watch
Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Added recommendation on up-to-date xserver-xorg-core and conflict on older versions to guest-utils, closes: #476526
Provide xserver-xorg-input-2 and xserver-xorg-video-2 with guest-utils.
Removed watch file, I couldn't find a way to get the orig tarball without first accepting a license.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-23 15:11:53 UTC (rev 254)
+++ trunk/debian/changelog	2008-04-24 09:54:02 UTC (rev 255)
@@ -3,6 +3,11 @@
   * Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils.
   * Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
     init script from overwriting values, closes: #475193
+  * Added recommendation on up-to-date xserver-xorg-core and conflict on
+    older versions to guest-utils, closes: #476526
+  * Provide xserver-xorg-input-2 and xserver-xorg-video-2 with guest-utils.
+  * Removed watch file, I couldn't find a way to get the orig tarball without
+    first accepting a license.
 
  -- Michael Meskes <meskes at debian.org>  Wed, 23 Apr 2008 16:56:49 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-04-23 15:11:53 UTC (rev 254)
+++ trunk/debian/control	2008-04-24 09:54:02 UTC (rev 255)
@@ -70,8 +70,10 @@
 Package: virtualbox-ose-guest-utils
 Architecture: i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, pciutils
-Recommends: virtualbox-ose-guest-modules
+Conflicts: xserver-xorg-core (< 2:1.4)
+Recommends: virtualbox-ose-guest-modules, xserver-xorg-core (>= 2:1.4)
 Suggests: virtualbox-ose-guest-source
+Provides: xserver-xorg-video-2, xserver-xorg-input-2
 Description: x86 virtualization solution - guest utilities
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a

Deleted: trunk/debian/watch
===================================================================
--- trunk/debian/watch	2008-04-23 15:11:53 UTC (rev 254)
+++ trunk/debian/watch	2008-04-24 09:54:02 UTC (rev 255)
@@ -1,4 +0,0 @@
-version=3
-
-opts=dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \
- http://virtualbox.org/wiki/Downloads .*/VirtualBox-([\d\.\-]+)_OSE.tar.bz2