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

pwinnertz-guest at alioth.debian.org pwinnertz-guest at alioth.debian.org
Wed Jul 25 12:32:32 UTC 2007 

Author: pwinnertz-guest
Date: 2007-07-25 12:32:31 +0000 (Wed, 25 Jul 2007)
New Revision: 17

Added:
   dists/trunk/virtualbox/debian/patches/remove_additions.dpatch
   dists/trunk/virtualbox/debian/patches/yasm.dpatch
Modified:
   dists/trunk/virtualbox/debian/README.rebuild
   dists/trunk/virtualbox/debian/changelog
   dists/trunk/virtualbox/debian/control
   dists/trunk/virtualbox/debian/patches/00list
   dists/trunk/virtualbox/debian/patches/01-compiler.dpatch
   dists/trunk/virtualbox/debian/virtualbox.postinst
Log:
some modifications to build and to upload an corrected version


Modified: dists/trunk/virtualbox/debian/README.rebuild
===================================================================
--- dists/trunk/virtualbox/debian/README.rebuild	2007-07-01 10:07:09 UTC (rev 16)
+++ dists/trunk/virtualbox/debian/README.rebuild	2007-07-25 12:32:31 UTC (rev 17)
@@ -3,6 +3,10 @@
 
 Unpack the tar.bz2 from upstream and rename the created dir to: virtualbox-<version>
 Then remove the complete ./kBuild and ./tools dirs and remove the complete ./src/recompiler/precomiled dir. 
+Furthermore you have to remove for license issues the complete subtree of: ./src/VBox/Additions/. 
+
+in order to prevent lintian from makeing warnings for nothing delete this dir too:
+./src/libs/xpcom18a4/nsprpub/build/autoconf
 Now repack it with tar cfvz virtualbox_<version>.dfsg.orig.tar.gz
 
 Now you should be able to build the package with the tools coming with debian.

Modified: dists/trunk/virtualbox/debian/changelog
===================================================================
--- dists/trunk/virtualbox/debian/changelog	2007-07-01 10:07:09 UTC (rev 16)
+++ dists/trunk/virtualbox/debian/changelog	2007-07-25 12:32:31 UTC (rev 17)
@@ -1,9 +1,7 @@
 virtualbox (1.4.0-1) experimental; urgency=low
 
-  [ Daniel Baumann ]
+  [ Philipp Hug ]
   * Initial release (Closes: #406992, #407001, #409711).
-
-  [ Patrick Hug ]
   * Stripped kbuild and yasm from source tarball
   * Use Debian's kbuild and yasm instead
   * Added myself as uploader
@@ -17,4 +15,14 @@
   * Disabled stripping for VMM because it breaks VirtualBox
   * Don't require kernel module, recommend it instead
 
- -- Philipp Hug <debian at hug.cx>  Mon, 18 Jun 2007 17:58:11 +0100
+  [ Patrick Winnertz ]
+  * Remove Microsoft license stuff from orig.tar.gz (repackaged it )
+    See README.rebuild for details.
+  * Added patch to use own yasm
+  * Added patch to remove Additions from the Makefile.kmk
+  * Remove ./src/libs/xpcom18a4/nsprpub/build/autoconf from source tarball.
+  * Added #DEBHELPER# into postinst
+  * Switch from gcc-3.4 to gcc-4.1 since gcc-3.x is deprecated
+  * Added build-dep libhal-dev
+
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Wed, 25 Jul 2007 14:26:45 +0200

Modified: dists/trunk/virtualbox/debian/control
===================================================================
--- dists/trunk/virtualbox/debian/control	2007-07-01 10:07:09 UTC (rev 16)
+++ dists/trunk/virtualbox/debian/control	2007-07-25 12:32:31 UTC (rev 17)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Daniel Baumann <daniel at debian.org>
 Uploaders: Patrick Winnertz <patrick.winnertz at skolelinux.org>, Philipp Hug <debian at hug.cx>
-Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, yasm, kbuild
+Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, gcc-3.4, g++-3.4, iasl, libacl1-dev, libasound-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, libxerces27-dev, libxcursor-dev, uuid-dev, xalan, xsltproc, zlib1g-dev, libstdc++5, yasm, kbuild, libhal-dev
 Standards-Version: 3.7.2
 
 Package: virtualbox

Modified: dists/trunk/virtualbox/debian/patches/00list
===================================================================
--- dists/trunk/virtualbox/debian/patches/00list	2007-07-01 10:07:09 UTC (rev 16)
+++ dists/trunk/virtualbox/debian/patches/00list	2007-07-25 12:32:31 UTC (rev 17)
@@ -1,3 +1,5 @@
 02-kernel.dpatch
 03-configure.dpatch
 04-host-module.dpatch
+yasm.dpatch
+remove_additions.dpatch

Modified: dists/trunk/virtualbox/debian/patches/01-compiler.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/01-compiler.dpatch	2007-07-01 10:07:09 UTC (rev 16)
+++ dists/trunk/virtualbox/debian/patches/01-compiler.dpatch	2007-07-25 12:32:31 UTC (rev 17)
@@ -14,8 +14,8 @@
  XPCOM=1
 -CC="gcc"
 -CXX="g++"
-+CC="gcc-3.4"
-+CXX="g++-3.4"
++CC="gcc-4.1"
++CXX="g++-4.1"
  BCC="bcc"
  YASM="yasm"
  IASL="iasl"

Added: dists/trunk/virtualbox/debian/patches/remove_additions.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/remove_additions.dpatch	                        (rev 0)
+++ dists/trunk/virtualbox/debian/patches/remove_additions.dpatch	2007-07-25 12:32:31 UTC (rev 17)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: 
+
+ at DPATCH@
+--- src/VBox/Makefile.kmk.orig	2007-07-25 14:08:40.000000000 +0200
++++ src/VBox/Makefile.kmk	2007-07-25 14:08:46.000000000 +0200
+@@ -44,9 +44,9 @@
+ SUBDIRS += RDP
+ endif
+ 
+-#ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),)
+-#SUBDIRS += Additions
+-#endif
++ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),)
++SUBDIRS += Additions
++endif
+ 
+ SUBDIRS += Frontends
+ 


Property changes on: dists/trunk/virtualbox/debian/patches/remove_additions.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: dists/trunk/virtualbox/debian/patches/yasm.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/yasm.dpatch	                        (rev 0)
+++ dists/trunk/virtualbox/debian/patches/yasm.dpatch	2007-07-25 12:32:31 UTC (rev 17)
@@ -0,0 +1,16 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: .
+
+ at DPATCH@
+--- ./Config.kmk.orig	2007-07-25 11:51:55.000000000 +0200
++++ ./Config.kmk	2007-07-25 11:52:10.000000000 +0200
+@@ -764,7 +764,7 @@
+ # We need to export YASM for OSE, but since it was converted to .zip we need to
+ # allow for the location used by the zip to be properly cleaned up first.
+ ifeq ($(filter-out win.x86 linux.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
+- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
++ PATH_TOOL_YASM ?= /usr/bin
+ endif
+ 
+ # XPCOM setup for all but win32.


Property changes on: dists/trunk/virtualbox/debian/patches/yasm.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: dists/trunk/virtualbox/debian/virtualbox.postinst
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.postinst	2007-07-01 10:07:09 UTC (rev 16)
+++ dists/trunk/virtualbox/debian/virtualbox.postinst	2007-07-25 12:32:31 UTC (rev 17)
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+#DEBHELPER#
+
 action="$1"
 oldversion="$2"

More information about the Pkg-virtualbox-commits mailing list