[Pkg-virtualbox-commits] r19 - in dists/trunk/virtualbox/debian: . patches
pwinnertz-guest at alioth.debian.org
pwinnertz-guest at alioth.debian.org
Wed Jul 25 21:30:12 UTC 2007
Author: pwinnertz-guest
Date: 2007-07-25 21:30:11 +0000 (Wed, 25 Jul 2007)
New Revision: 19
Added:
dists/trunk/virtualbox/debian/virtualbox.lintian-overrides
Removed:
dists/trunk/virtualbox/debian/patches/01-compiler.dpatch
Modified:
dists/trunk/virtualbox/debian/changelog
dists/trunk/virtualbox/debian/control
dists/trunk/virtualbox/debian/patches/remove_additions.dpatch
dists/trunk/virtualbox/debian/rules
dists/trunk/virtualbox/debian/virtualbox.dirs
Log:
Added some patches
Modified: dists/trunk/virtualbox/debian/changelog
===================================================================
--- dists/trunk/virtualbox/debian/changelog 2007-07-25 15:55:28 UTC (rev 18)
+++ dists/trunk/virtualbox/debian/changelog 2007-07-25 21:30:11 UTC (rev 19)
@@ -1,4 +1,4 @@
-virtualbox (1.4.0-1) experimental; urgency=low
+virtualbox (1.4.0-dfsg-1) experimental; urgency=low
[ Daniel Baumann ]
* Initial release (Closes: #406992, #407001, #409711).
@@ -23,8 +23,9 @@
* 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
+ * Doesn't depend on gcc-3.4 and g++-3.4 since they are going to be removed from
+ debian. Use default instead.
+ Therefore I removed the patch, too.
+ * Don't call dh_installdeb twice. (build-dep & build-indep)
- -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 25 Jul 2007 14:26:45 +0200
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 25 Jul 2007 15:08:38 +0200
Modified: dists/trunk/virtualbox/debian/control
===================================================================
--- dists/trunk/virtualbox/debian/control 2007-07-25 15:55:28 UTC (rev 18)
+++ dists/trunk/virtualbox/debian/control 2007-07-25 21:30:11 UTC (rev 19)
@@ -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, libhal-dev
+Build-Depends: debhelper (>= 5), dpatch, bcc, bin86, bzip2, 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
Standards-Version: 3.7.2
Package: virtualbox
Deleted: dists/trunk/virtualbox/debian/patches/01-compiler.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/01-compiler.dpatch 2007-07-25 15:55:28 UTC (rev 18)
+++ dists/trunk/virtualbox/debian/patches/01-compiler.dpatch 2007-07-25 21:30:11 UTC (rev 19)
@@ -1,21 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-compiler.dpatch by Daniel Baumann <daniel at debian.org>
-##
-## DP: Set compiler to gcc-3.4/g++-3.4.
-
- at DPATCH@
-
-diff -Naur virtualbox-20070115.orig/configure virtualbox-20070115/configure
---- virtualbox-20070115.orig/configure 2007-01-15 22:49:48.000000000 +0000
-+++ virtualbox-20070115/configure 2007-01-16 16:12:35.000000000 +0000
-@@ -26,8 +26,8 @@
- #
- OSE=1
- XPCOM=1
--CC="gcc"
--CXX="g++"
-+CC="gcc-4.1"
-+CXX="g++-4.1"
- BCC="bcc"
- YASM="yasm"
- IASL="iasl"
Modified: dists/trunk/virtualbox/debian/patches/remove_additions.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/remove_additions.dpatch 2007-07-25 15:55:28 UTC (rev 18)
+++ dists/trunk/virtualbox/debian/patches/remove_additions.dpatch 2007-07-25 21:30:11 UTC (rev 19)
@@ -1,20 +1,19 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
##
-## DP:
@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
+--- ./src/VBox/Makefile.kmk 2007-07-25 14:41:50.000000000 +0200
++++ ./src/VBox/Makefile.kmk 2007-07-25 14:42:03.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
+-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
Modified: dists/trunk/virtualbox/debian/rules
===================================================================
--- dists/trunk/virtualbox/debian/rules 2007-07-25 15:55:28 UTC (rev 18)
+++ dists/trunk/virtualbox/debian/rules 2007-07-25 21:30:11 UTC (rev 19)
@@ -73,6 +73,16 @@
dh_clean
+#Rebuild the orig.tar.gz
+dfsg-free:
+ rm -rf ./kBuild
+ rm -rf ./tools
+ rm -rf ./src/VBox/Additions
+ rm -rf ./src/libs/xpcom18a4/nsprpub/build/autoconf
+ rm -rf ./src/recompiler/precomiled
+ ( cd .. & mv Virtualbox-OSE-1.4.0 virtualbox-1.4.0-dfsg & \
+ tar cfz virtualbox-1.4.0-dfsg.orig.tar.gz virtualbox-1.4.0-dfsg )
+
install: DH_OPTIONS=
install: build
dh_testdir
@@ -80,6 +90,9 @@
dh_clean -k
dh_installdirs
+ install -p -m 0644 $(CURDIR)/debian/virtualbox.lintian-overrides \
+ $(CURDIR)/debian/virtualbox/usr/share/lintian/overrides/virtualbox
+
# Installing virtualbox
cp -r out/linux.*/release/bin debian/virtualbox/usr/lib/virtualbox
cp $(CURDIR)/debian/VBox.sh $(CURDIR)/debian/virtualbox/usr/lib/virtualbox
@@ -92,17 +105,6 @@
install -D -m 0644 src/VBox/Frontends/VirtualBox/images/ico32x01.png debian/virtualbox/usr/share/icons/virtualbox.png
install -D -m 0644 debian/pixmap/virtualbox.xpm debian/virtualbox/usr/share/pixmaps/virtualbox.xpm
- #strip some files manually since dh_strip doesn't recognise them:
-
- #strip debian/virtualbox/usr/lib/virtualbox/testcase/tstLdrObj.gc
- #strip debian/virtualbox/usr/lib/virtualbox/VMMGC.gc
- #strip debian/virtualbox/usr/lib/virtualbox/VMMR0.r0
- #strip debian/virtualbox/usr/lib/virtualbox/tstMicroGC.gc
- #strip debian/virtualbox/usr/lib/virtualbox/VBoxDDGC.gc
- #strip debian/virtualbox/usr/lib/virtualbox/VBoxDD2GC.gc
- #strip debian/virtualbox/usr/lib/virtualbox/VBoxDDR0.r0
- #strip debian/virtualbox/usr/lib/virtualbox/VBoxDD2R0.r0
-
echo "# VirtualBox installation directory" > $(CURDIR)/debian/virtualbox/etc/vbox/vbox.cfg
echo "INSTALL_DIR="\"/usr/lib/virtualbox\" >> $(CURDIR)/debian/virtualbox/etc/vbox/vbox.cfg
@@ -166,7 +168,7 @@
dh_strip
dh_compress
dh_fixperms
- dh_installdeb
+ #dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
Modified: dists/trunk/virtualbox/debian/virtualbox.dirs
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.dirs 2007-07-25 15:55:28 UTC (rev 18)
+++ dists/trunk/virtualbox/debian/virtualbox.dirs 2007-07-25 21:30:11 UTC (rev 19)
@@ -2,3 +2,4 @@
usr/sbin
usr/lib
etc/vbox
+usr/share/lintian/overrides
Added: dists/trunk/virtualbox/debian/virtualbox.lintian-overrides
===================================================================
--- dists/trunk/virtualbox/debian/virtualbox.lintian-overrides (rev 0)
+++ dists/trunk/virtualbox/debian/virtualbox.lintian-overrides 2007-07-25 21:30:11 UTC (rev 19)
@@ -0,0 +1,19 @@
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxC.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxXML.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSVCM.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDDU.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD2.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD.so
+virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxRT.so
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2GC.gc
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2R0.r0
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDGC.gc
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDR0.r0
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/VMMGC.gc
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/VMMR0.r0
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/testcase/tstLdrObj.gc
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/testcase/tstLdrObjR0.r0
+virtualbox: unstripped-binary-or-object ./usr/lib/virtualbox/tstMicroGC.gc
+
More information about the Pkg-virtualbox-commits
mailing list