Hello community, here is the log from the commit of package virtualbox-ose checked in at Mon Sep 8 18:07:44 CEST 2008. -------- --- virtualbox-ose/virtualbox-ose.changes 2008-06-25 23:58:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2008-09-08 17:09:33.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 8 17:09:26 CEST 2008 - dmueller@suse.de + +- merge into openSUSE Factory + +------------------------------------------------------------------- +Sat Aug 9 13:30:21 CEST 2008 - suse-tux@gmx.de + +- new upstream version 1.6.4 +- added Patch14 (virtualbox-missing-Makefiles.diff) because some Makefiles are missing + (Makefiles are taken from http://article.gmane.org/gmane.comp.emulators.virtualbox.devel/706) + +------------------------------------------------------------------- Old: ---- VirtualBox-1.6.2-OSE-patched.tar.bz2 New: ---- VirtualBox-1.6.4-OSE-patched.tar.bz2 virtualbox-missing-Makefiles.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.A16068/_old 2008-09-08 18:07:30.000000000 +0200 +++ /var/tmp/diff_new_pack.A16068/_new 2008-09-08 18:07:30.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package virtualbox-ose (Version 1.6.2) +# spec file for package virtualbox-ose (Version 1.6.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -55,7 +62,7 @@ %endif %endif # -Version: 1.6.2 +Version: 1.6.4 Release: 1 Summary: VirtualBox OSE is an Emulator License: GPL v2 or later @@ -88,6 +95,7 @@ Patch11: vbox-vboxfs-2.6.25 Patch12: vbox-buildfix Patch13: virtualbox-use-intree-yasm.diff +Patch14: virtualbox-missing-Makefiles.diff # BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils @@ -182,6 +190,7 @@ #%patch11 -p1 %patch12 -p1 %patch13 +%patch14 %__cp %{SOURCE7} . %build @@ -453,6 +462,12 @@ %{_datadir}/virtualbox/x11restore.pl %changelog +* Mon Sep 08 2008 dmueller@suse.de +- merge into openSUSE Factory +* Sat Aug 09 2008 suse-tux@gmx.de +- new upstream version 1.6.4 +- added Patch14 (virtualbox-missing-Makefiles.diff) because some Makefiles are missing + (Makefiles are taken from http://article.gmane.org/gmane.comp.emulators.virtualbox.devel/706) * Thu Jun 26 2008 dmueller@suse.de - merged factory and OBS package * Fri Jun 13 2008 suse-tux@gmx.de ++++++ VirtualBox-1.6.2-OSE-patched.tar.bz2 -> VirtualBox-1.6.4-OSE-patched.tar.bz2 ++++++ virtualbox-ose/VirtualBox-1.6.2-OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-1.6.4-OSE-patched.tar.bz2 differ: byte 11, line 1 ++++++ virtualbox-missing-Makefiles.diff ++++++ Index: src/apps/Makefile.kmk =================================================================== --- /dev/null +++ src/apps/Makefile.kmk @@ -0,0 +1,35 @@ +# $Id: Makefile.kmk 34052 2008-08-04 17:27:28Z klaus $ +## @file +# Top-level makefile for the external apps. +# + +# +# Copyright (C) 2006-2007 Sun Microsystems, Inc. +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa +# Clara, CA 95054 USA or visit http://www.sun.com if you need +# additional information or have any questions. +# + +DEPTH = ../.. +include $(KBUILD_PATH)/header.kmk + +ifdef VBOX_WITH_KCHMVIEWER +ifneq ($(wildcard kchmviewer-2.6),) +SUBDIRS.linux = kchmviewer-2.6 +endif +endif + +ifneq ($(wildcard tunctl),) +SUBDIRS.linux += tunctl +endif + +include $(KBUILD_PATH)/rules.kmk Index: src/apps/tunctl/Makefile.kmk =================================================================== --- /dev/null +++ src/apps/tunctl/Makefile.kmk @@ -0,0 +1,35 @@ +# $Id: Makefile.kmk 31342 2008-05-28 08:44:35Z frank $ +## @file +# Makefile for VBoxTunctl, which is identical to tunctl from Usermode Linux +# except for the name. +# + +# +# Copyright (C) 2006-2007 Sun Microsystems, Inc. +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa +# Clara, CA 95054 USA or visit http://www.sun.com if you need +# additional information or have any questions. +# + +DEPTH = ../../.. +include $(KBUILD_PATH)/header.kmk + +ifneq ($(KBUILD_HOST),linux) +$(error "VBoxTunctl can only be built on Linux!") +endif + +PROGRAMS = VBoxTunctl + +VBoxTunctl_TEMPLATE = VBOXR3EXE +VBoxTunctl_SOURCES = tunctl.c + +include $(KBUILD_PATH)/footer.kmk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org