[Pkg-virtualbox-commits] r128 - tags tags/1.5.2-dfsg2-4/debian tags/1.5.2-dfsg2-4/debian/lintian tags/1.5.2-dfsg2-4/debian/patches trunk/debian trunk/debian/lintian trunk/debian/patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Thu Dec 6 11:19:53 UTC 2007
Author: meskes
Date: 2007-12-06 11:19:53 +0000 (Thu, 06 Dec 2007)
New Revision: 128
Added:
tags/1.5.2-dfsg2-4/
tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.Makefile
trunk/debian/virtualbox-ose-guest-source.Makefile
Modified:
tags/1.5.2-dfsg2-4/debian/changelog
tags/1.5.2-dfsg2-4/debian/copyright
tags/1.5.2-dfsg2-4/debian/lintian/virtualbox-ose
tags/1.5.2-dfsg2-4/debian/patches/11-module-build.dpatch
tags/1.5.2-dfsg2-4/debian/rules
tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.control.modules.in
tags/1.5.2-dfsg2-4/debian/virtualbox-ose.dirs
trunk/debian/changelog
trunk/debian/copyright
trunk/debian/lintian/virtualbox-ose
trunk/debian/patches/11-module-build.dpatch
trunk/debian/rules
trunk/debian/virtualbox-ose-guest-source.control.modules.in
trunk/debian/virtualbox-ose.dirs
Log:
* Made virtualbox-ose-guest-source compile under linux-modules-extra.
* Made virtualbox-ose-guest-modules i386 only.
* Re-encoded copyright file in UTF-8.
* Removed empty /usr/sbin directory in virtualbox-ose package.
* Removed /usr/lib/virtualbox/VBox.png, doesn't seem to be needed.
* Also removed override for this file.
* Moved binary file xpidl from /usr/share back to /usr/lib.
Copied: tags/1.5.2-dfsg2-4 (from rev 127, trunk)
Modified: tags/1.5.2-dfsg2-4/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/changelog 2007-12-06 11:19:53 UTC (rev 128)
@@ -1,9 +1,19 @@
virtualbox-ose (1.5.2-dfsg2-4) unstable; urgency=low
- * Changed my maintainer address
+ [ Patrick Winnertz ]
+ * Changed my maintainer address
- -- Patrick Winnertz <winnie at debian.org> Wed, 05 Dec 2007 17:00:39 +0100
+ [ meskes at debian.org ]
+ * Made virtualbox-ose-guest-source compile under linux-modules-extra.
+ * Made virtualbox-ose-guest-modules i386 only.
+ * Re-encoded copyright file in UTF-8.
+ * Removed empty /usr/sbin directory in virtualbox-ose package.
+ * Removed /usr/lib/virtualbox/VBox.png, doesn't seem to be needed.
+ * Also removed override for this file.
+ * Moved binary file xpidl from /usr/share back to /usr/lib.
+ -- Michael Meskes <meskes at debian.org> Thu, 06 Dec 2007 09:11:51 +0100
+
virtualbox-ose (1.5.2-dfsg2-3) unstable; urgency=low
* Added patch to remove registration form, closes: #447626, #453784
Modified: tags/1.5.2-dfsg2-4/debian/copyright
===================================================================
--- trunk/debian/copyright 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/copyright 2007-12-06 11:19:53 UTC (rev 128)
@@ -218,7 +218,7 @@
Copyright 1997 David Faure
Copyright 1998 Morten Welinder
Copyright 1998 Ulrich Weigand
- Copyright 1999 Ove Kåven
+ Copyright 1999 Ove KÃ¥ven
./src/VBox/Frontends/src/linux/keyboard_outofwine.h
Modified: tags/1.5.2-dfsg2-4/debian/lintian/virtualbox-ose
===================================================================
--- trunk/debian/lintian/virtualbox-ose 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/lintian/virtualbox-ose 2007-12-06 11:19:53 UTC (rev 128)
@@ -19,5 +19,4 @@
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedFolders.so
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedOpenGL.so
-virtualbox-ose: image-file-in-usr-lib usr/lib/virtualbox/VBox.png
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxKeyboard.so
Modified: tags/1.5.2-dfsg2-4/debian/patches/11-module-build.dpatch
===================================================================
--- trunk/debian/patches/11-module-build.dpatch 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/patches/11-module-build.dpatch 2007-12-06 11:19:53 UTC (rev 128)
@@ -8,7 +8,7 @@
diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module
--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module 2007-12-03 13:35:34.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module 2007-12-05 13:43:58.000000000 +0100
@@ -14,7 +14,7 @@
# be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -18,9 +18,18 @@
OBJS = \
cmc.o \
hgcmcall.o \
+@@ -92,6 +92,8 @@
+ ifndef KBUILD_EXTMOD
+ KBUILD_EXTMOD := $(shell pwd)
+ endif
++# make sure we have a correct path
++ KBUILD_EXTMOD := $(subst $(MODULE),,$(KBUILD_EXTMOD))/$(MODULE)
+ INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ export INCL
+ endif
diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module
--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-12-03 13:35:46.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-12-05 13:44:27.000000000 +0100
@@ -14,7 +14,7 @@
# be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -30,9 +39,18 @@
OBJS = \
vfsmod.o \
vfs-utils.o \
+@@ -99,6 +99,8 @@
+ ifndef KBUILD_EXTMOD
+ KBUILD_EXTMOD := $(shell pwd)
+ endif
++# make sure we have a correct path
++ KBUILD_EXTMOD := $(subst $(MODULE),,$(KBUILD_EXTMOD))/$(MODULE)
+ INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ export INCL
+ endif
diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile
--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-03 13:33:25.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-05 13:43:14.000000000 +0100
@@ -40,7 +40,7 @@
endif
Modified: tags/1.5.2-dfsg2-4/debian/rules
===================================================================
--- trunk/debian/rules 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/rules 2007-12-06 11:19:53 UTC (rev 128)
@@ -81,6 +81,8 @@
# move architecture independant files to /usr/share/virtualbox instead of /usr/lib/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/nls debian/$(sname)/usr/share/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/sdk debian/$(sname)/usr/share/virtualbox
+ mv debian/$(sname)/usr/share/virtualbox/sdk/bin/xpidl debian/$(sname)/usr/lib/virtualbox/
+ ln -s debian/$(sname)/usr/lib/virtualbox/xpidl debian/$(sname)/usr/share/virtualbox/sdk/bin
install -D -m 0755 debian/scripts/VBox.sh debian/$(sname)/usr/lib/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/VBoxTunctl debian/$(sname)/usr/bin/
@@ -96,7 +98,7 @@
ln -s VBoxTAP debian/$(sname)/usr/bin/VBoxDeleteIF
install -D -m 0644 debian/desktop/virtualbox-ose.desktop debian/$(sname)/usr/share/applications/virtualbox-ose.desktop
- install -D -m 0644 src/VBox/Frontends/VirtualBox/images/ico32x01.png debian/$(sname)/usr/share/icons/virtualbox.png
+ mv debian/$(sname)/usr/lib/virtualbox/VBox.png debian/$(sname)/usr/share/icons/virtualbox.png
install -D -m 0644 debian/pixmap/virtualbox-ose.xpm debian/$(sname)/usr/share/pixmaps/virtualbox-ose.xpm
install -D -m 644 src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
install -D -m 644 debian/interfaces debian/$(sname)/etc/vbox
@@ -127,6 +129,7 @@
cp debian/$(gsource).control.modules.in debian/$(gsource)/usr/src/modules/$(gname)/debian/control.modules.in
cp debian/$(gsource).postinst.modules.in debian/$(gsource)/usr/src/modules/$(gname)/debian/postinst.modules.in
cp debian/$(gsource).udev debian/$(gsource)/usr/src/modules/$(gname)/debian/udev
+ cp debian/$(gsource).Makefile debian/$(gsource)/usr/src/modules/$(gname)/Makefile
install -m 755 debian/$(gsource).rules debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
cd debian/$(gsource)/usr/src && tar c modules | bzip2 -9 > $(gname).tar.bz2 && rm -rf modules
Added: tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.Makefile
===================================================================
--- tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.Makefile (rev 0)
+++ tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.Makefile 2007-12-06 11:19:53 UTC (rev 128)
@@ -0,0 +1,2 @@
+obj-m = vboxadd/ vboxvfs/
+
Modified: tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.control.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.control.modules.in 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/virtualbox-ose-guest-source.control.modules.in 2007-12-06 11:19:53 UTC (rev 128)
@@ -10,7 +10,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk
Package: virtualbox-ose-guest-modules-_KVERS_
-Architecture: amd64 i386
+Architecture: i386
Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
Provides: virtualbox-ose-guest-modules
Description: VirtualBox guest addition modules for Linux (kernel _KVERS_)
Modified: tags/1.5.2-dfsg2-4/debian/virtualbox-ose.dirs
===================================================================
--- trunk/debian/virtualbox-ose.dirs 2007-12-05 15:58:58 UTC (rev 127)
+++ tags/1.5.2-dfsg2-4/debian/virtualbox-ose.dirs 2007-12-06 11:19:53 UTC (rev 128)
@@ -1,5 +1,5 @@
usr/bin
-usr/sbin
usr/lib
usr/share/virtualbox
+usr/share/icons
etc/vbox
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/changelog 2007-12-06 11:19:53 UTC (rev 128)
@@ -1,9 +1,19 @@
virtualbox-ose (1.5.2-dfsg2-4) unstable; urgency=low
- * Changed my maintainer address
+ [ Patrick Winnertz ]
+ * Changed my maintainer address
- -- Patrick Winnertz <winnie at debian.org> Wed, 05 Dec 2007 17:00:39 +0100
+ [ meskes at debian.org ]
+ * Made virtualbox-ose-guest-source compile under linux-modules-extra.
+ * Made virtualbox-ose-guest-modules i386 only.
+ * Re-encoded copyright file in UTF-8.
+ * Removed empty /usr/sbin directory in virtualbox-ose package.
+ * Removed /usr/lib/virtualbox/VBox.png, doesn't seem to be needed.
+ * Also removed override for this file.
+ * Moved binary file xpidl from /usr/share back to /usr/lib.
+ -- Michael Meskes <meskes at debian.org> Thu, 06 Dec 2007 09:11:51 +0100
+
virtualbox-ose (1.5.2-dfsg2-3) unstable; urgency=low
* Added patch to remove registration form, closes: #447626, #453784
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/copyright 2007-12-06 11:19:53 UTC (rev 128)
@@ -218,7 +218,7 @@
Copyright 1997 David Faure
Copyright 1998 Morten Welinder
Copyright 1998 Ulrich Weigand
- Copyright 1999 Ove Kåven
+ Copyright 1999 Ove KÃ¥ven
./src/VBox/Frontends/src/linux/keyboard_outofwine.h
Modified: trunk/debian/lintian/virtualbox-ose
===================================================================
--- trunk/debian/lintian/virtualbox-ose 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/lintian/virtualbox-ose 2007-12-06 11:19:53 UTC (rev 128)
@@ -19,5 +19,4 @@
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedFolders.so
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedOpenGL.so
-virtualbox-ose: image-file-in-usr-lib usr/lib/virtualbox/VBox.png
virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxKeyboard.so
Modified: trunk/debian/patches/11-module-build.dpatch
===================================================================
--- trunk/debian/patches/11-module-build.dpatch 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/patches/11-module-build.dpatch 2007-12-06 11:19:53 UTC (rev 128)
@@ -8,7 +8,7 @@
diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module
--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module 2007-12-03 13:35:34.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module 2007-12-05 13:43:58.000000000 +0100
@@ -14,7 +14,7 @@
# be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -18,9 +18,18 @@
OBJS = \
cmc.o \
hgcmcall.o \
+@@ -92,6 +92,8 @@
+ ifndef KBUILD_EXTMOD
+ KBUILD_EXTMOD := $(shell pwd)
+ endif
++# make sure we have a correct path
++ KBUILD_EXTMOD := $(subst $(MODULE),,$(KBUILD_EXTMOD))/$(MODULE)
+ INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ export INCL
+ endif
diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module
--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-12-03 13:35:46.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-12-05 13:44:27.000000000 +0100
@@ -14,7 +14,7 @@
# be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -30,9 +39,18 @@
OBJS = \
vfsmod.o \
vfs-utils.o \
+@@ -99,6 +99,8 @@
+ ifndef KBUILD_EXTMOD
+ KBUILD_EXTMOD := $(shell pwd)
+ endif
++# make sure we have a correct path
++ KBUILD_EXTMOD := $(subst $(MODULE),,$(KBUILD_EXTMOD))/$(MODULE)
+ INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ export INCL
+ endif
diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile
--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-03 13:33:25.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-05 13:43:14.000000000 +0100
@@ -40,7 +40,7 @@
endif
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/rules 2007-12-06 11:19:53 UTC (rev 128)
@@ -81,6 +81,8 @@
# move architecture independant files to /usr/share/virtualbox instead of /usr/lib/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/nls debian/$(sname)/usr/share/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/sdk debian/$(sname)/usr/share/virtualbox
+ mv debian/$(sname)/usr/share/virtualbox/sdk/bin/xpidl debian/$(sname)/usr/lib/virtualbox/
+ ln -s debian/$(sname)/usr/lib/virtualbox/xpidl debian/$(sname)/usr/share/virtualbox/sdk/bin
install -D -m 0755 debian/scripts/VBox.sh debian/$(sname)/usr/lib/virtualbox
mv debian/$(sname)/usr/lib/virtualbox/VBoxTunctl debian/$(sname)/usr/bin/
@@ -96,7 +98,7 @@
ln -s VBoxTAP debian/$(sname)/usr/bin/VBoxDeleteIF
install -D -m 0644 debian/desktop/virtualbox-ose.desktop debian/$(sname)/usr/share/applications/virtualbox-ose.desktop
- install -D -m 0644 src/VBox/Frontends/VirtualBox/images/ico32x01.png debian/$(sname)/usr/share/icons/virtualbox.png
+ mv debian/$(sname)/usr/lib/virtualbox/VBox.png debian/$(sname)/usr/share/icons/virtualbox.png
install -D -m 0644 debian/pixmap/virtualbox-ose.xpm debian/$(sname)/usr/share/pixmaps/virtualbox-ose.xpm
install -D -m 644 src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
install -D -m 644 debian/interfaces debian/$(sname)/etc/vbox
@@ -127,6 +129,7 @@
cp debian/$(gsource).control.modules.in debian/$(gsource)/usr/src/modules/$(gname)/debian/control.modules.in
cp debian/$(gsource).postinst.modules.in debian/$(gsource)/usr/src/modules/$(gname)/debian/postinst.modules.in
cp debian/$(gsource).udev debian/$(gsource)/usr/src/modules/$(gname)/debian/udev
+ cp debian/$(gsource).Makefile debian/$(gsource)/usr/src/modules/$(gname)/Makefile
install -m 755 debian/$(gsource).rules debian/$(gsource)/usr/src/modules/$(gname)/debian/rules
cd debian/$(gsource)/usr/src && tar c modules | bzip2 -9 > $(gname).tar.bz2 && rm -rf modules
Added: trunk/debian/virtualbox-ose-guest-source.Makefile
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.Makefile (rev 0)
+++ trunk/debian/virtualbox-ose-guest-source.Makefile 2007-12-06 11:19:53 UTC (rev 128)
@@ -0,0 +1,2 @@
+obj-m = vboxadd/ vboxvfs/
+
Modified: trunk/debian/virtualbox-ose-guest-source.control.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.control.modules.in 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/virtualbox-ose-guest-source.control.modules.in 2007-12-06 11:19:53 UTC (rev 128)
@@ -10,7 +10,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk
Package: virtualbox-ose-guest-modules-_KVERS_
-Architecture: amd64 i386
+Architecture: i386
Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
Provides: virtualbox-ose-guest-modules
Description: VirtualBox guest addition modules for Linux (kernel _KVERS_)
Modified: trunk/debian/virtualbox-ose.dirs
===================================================================
--- trunk/debian/virtualbox-ose.dirs 2007-12-05 15:58:58 UTC (rev 127)
+++ trunk/debian/virtualbox-ose.dirs 2007-12-06 11:19:53 UTC (rev 128)
@@ -1,5 +1,5 @@
usr/bin
-usr/sbin
usr/lib
usr/share/virtualbox
+usr/share/icons
etc/vbox
More information about the Pkg-virtualbox-commits
mailing list