[Pkg-virtualbox-commits] r281 - in trunk/debian: . virtualbox-ose-guest-source.files virtualbox-ose-source.files

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-11 21:03:52 +0000 (Sun, 11 May 2008)
New Revision: 281

Modified:
   trunk/debian/changelog
   trunk/debian/virtualbox-ose-guest-source.files/rules
   trunk/debian/virtualbox-ose-source.files/rules
Log:
Reverting my change to make since the new kmk version works.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-11 21:03:26 UTC (rev 280)
+++ trunk/debian/changelog	2008-05-11 21:03:52 UTC (rev 281)
@@ -1,7 +1,27 @@
 virtualbox-ose (1.6.0-dfsg-1) unstable; urgency=low
 
   [ Michael Meskes ]
-  * New upstream version, closes: #475193, #478373, #478333, #479744
+  * New upstream version, closes: #479744
+  * 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.
+
+  [ Daniel Baumann ]
+  * Removing ffmpeg recursively in dfsg-free target in rules.
+  * Rediffing all patches.
+  * Renumbering all patches.
+  * Sanitizing dpatch headers.
+  * Stripping off embedded copy of libpng in dfsg-free target of rules.
+  * Stripping off embedded copy of libxml2 in dfsg-free target of rules.
+  * Stripping off embedded copy of libxslt in dfsg-free target of rules.
+  * Stripping off embedded copy of zlib in dfsg-free target of rules.
+
+ -- Michael Meskes <meskes at debian.org>  Sun, 11 May 2008 22:48:59 +0200
+
+virtualbox-ose (1.5.6-dfsg-7) unstable; urgency=low
+
+  [ Michael Meskes ]
   * Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils.
   * Added recommendation on up-to-date xserver-xorg-core and conflict on
     older versions to guest-utils, closes: #476526
@@ -11,28 +31,21 @@
   * Rewrote debian/rules for both source packages, hopefully this
     finally closes: #469882
   * Patched module Makefile to allow amd64 build in linux-modules-extra-2.6.
-  * 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.
-  * Do not use kmk to build modules, closes: #480012
+  * Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
+    init script from overwriting values, closes: #475193
 
   [ Daniel Baumann ]
   * Correcting wrong module-assistant manpage section in
     virtualbox-ose-*source.README.Debian.
   * Removing some reimported useless whitespaces.
-  * Removing ffmpeg recursively in dfsg-free target in rules.
-  * Rediffing all patches.
-  * Renumbering all patches.
-  * Sanitizing dpatch headers.
-  * Stripping off embedded copy of libpng in dfsg-free target of rules.
-  * Stripping off embedded copy of libxml2 in dfsg-free target of rules.
-  * Stripping off embedded copy of libxslt in dfsg-free target of rules.
-  * Stripping off embedded copy of zlib in dfsg-free target of rules.
   * Sanitizing all po headers.
 
- -- Michael Meskes <meskes at debian.org>  Fri, 02 May 2008 10:14:01 +0200
+  [ Patrick Winnertz ]
+  * Added patch to make virtualbox-ose-guest-source build with kernels >=
+    2.6.25. Thanks to Stefan Lippers-Hollmann. (Closes: 478373, 478333)
 
+ -- Michael Meskes <meskes at debian.org>  Sun, 11 May 2008 22:48:50 +0200
+
 virtualbox-ose (1.5.6-dfsg-6) unstable; urgency=low
 
   * Added two patches from upstream SVN to make virtualbox-ose build with

Modified: trunk/debian/virtualbox-ose-guest-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.files/rules	2008-05-11 21:03:26 UTC (rev 280)
+++ trunk/debian/virtualbox-ose-guest-source.files/rules	2008-05-11 21:03:52 UTC (rev 281)
@@ -42,6 +42,8 @@
 #
 ### end  KERNEL SETUP
 
+MAKE:=kmk
+
 clean:
 	(cd vboxadd; $(MAKE) clean)
 	(cd vboxvfs; $(MAKE) clean)

Modified: trunk/debian/virtualbox-ose-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-source.files/rules	2008-05-11 21:03:26 UTC (rev 280)
+++ trunk/debian/virtualbox-ose-source.files/rules	2008-05-11 21:03:52 UTC (rev 281)
@@ -49,6 +49,8 @@
 #
 ### end  KERNEL SETUP
 
+MAKE:=kmk
+
 binary-modules: prep-deb-files
 	dh_testroot
 	dh_clean -k