[Pkg-virtualbox-commits] r280 - in tags: . 1.5.6-dfsg-7/debian 1.5.6-dfsg-7/debian/patches 1.5.6-dfsg-7/debian/po 1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files 1.5.6-dfsg-7/debian/virtualbox-ose-source.files
meskes at alioth.debian.org
meskes at alioth.debian.org
Sun May 11 21:03:28 UTC 2008
Author: meskes
Date: 2008-05-11 21:03:26 +0000 (Sun, 11 May 2008)
New Revision: 280
Added:
tags/1.5.6-dfsg-7/
tags/1.5.6-dfsg-7/debian/patches/02-2.6.25_part2.dpatch
Modified:
tags/1.5.6-dfsg-7/debian/changelog
tags/1.5.6-dfsg-7/debian/control
tags/1.5.6-dfsg-7/debian/patches/00list
tags/1.5.6-dfsg-7/debian/patches/08-init-fail.dpatch
tags/1.5.6-dfsg-7/debian/po/cs.po
tags/1.5.6-dfsg-7/debian/po/es.po
tags/1.5.6-dfsg-7/debian/po/eu.po
tags/1.5.6-dfsg-7/debian/po/fi.po
tags/1.5.6-dfsg-7/debian/po/fr.po
tags/1.5.6-dfsg-7/debian/po/gl.po
tags/1.5.6-dfsg-7/debian/po/it.po
tags/1.5.6-dfsg-7/debian/po/ja.po
tags/1.5.6-dfsg-7/debian/po/nl.po
tags/1.5.6-dfsg-7/debian/po/pt.po
tags/1.5.6-dfsg-7/debian/po/pt_BR.po
tags/1.5.6-dfsg-7/debian/po/ru.po
tags/1.5.6-dfsg-7/debian/po/templates.pot
tags/1.5.6-dfsg-7/debian/po/vi.po
tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.README.Debian
tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files/control.modules.in
tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files/rules
tags/1.5.6-dfsg-7/debian/virtualbox-ose-source.README.Debian
tags/1.5.6-dfsg-7/debian/virtualbox-ose-source.files/rules
tags/1.5.6-dfsg-7/debian/virtualbox-ose.docs
Log:
Going to release 1.5.6-dfsg-7 to fix some urgent bugs before 1.6 becomes stable
enough. I try to regenerate our old -7 version and merge in the new stuff.
Copied: tags/1.5.6-dfsg-7 (from rev 279, tags/1.5.6-dfsg-6)
Modified: tags/1.5.6-dfsg-7/debian/changelog
===================================================================
--- tags/1.5.6-dfsg-6/debian/changelog 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/changelog 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,3 +1,30 @@
+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
+ * Provide xserver-xorg-input-2 and xserver-xorg-video-2 with guest-utils.
+ * Removed watch file, I couldn't find a way to get the orig tarball without
+ first accepting a license.
+ * 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.
+ * 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.
+ * Sanitizing all po headers.
+
+ [ 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: tags/1.5.6-dfsg-7/debian/control
===================================================================
--- tags/1.5.6-dfsg-6/debian/control 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/control 2008-05-11 21:03:26 UTC (rev 280)
@@ -70,8 +70,10 @@
Package: virtualbox-ose-guest-utils
Architecture: i386
Depends: ${shlibs:Depends}, ${misc:Depends}, pciutils
-Recommends: virtualbox-ose-guest-modules
+Conflicts: xserver-xorg-core (< 2:1.4)
+Recommends: virtualbox-ose-guest-modules, xserver-xorg-core (>= 2:1.4)
Suggests: virtualbox-ose-guest-source
+Provides: xserver-xorg-video-2, xserver-xorg-input-2
Description: x86 virtualization solution - guest utilities
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
Modified: tags/1.5.6-dfsg-7/debian/patches/00list
===================================================================
--- tags/1.5.6-dfsg-6/debian/patches/00list 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/patches/00list 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,5 +1,6 @@
01-no-64bit-guest.dpatch
02-2.6.25.dpatch
+02-2.6.25_part2.dpatch
03-config-kmk.dpatch
04-localconf-kmk.dpatch
05-vboxdrv-references.dpatch
@@ -10,3 +11,4 @@
10-initscript.dpatch
11-workaround-gcc-ice
12-gcc-4.3
+13-make-module
Added: tags/1.5.6-dfsg-7/debian/patches/02-2.6.25_part2.dpatch
===================================================================
--- tags/1.5.6-dfsg-7/debian/patches/02-2.6.25_part2.dpatch (rev 0)
+++ tags/1.5.6-dfsg-7/debian/patches/02-2.6.25_part2.dpatch 2008-05-11 21:03:26 UTC (rev 280)
@@ -0,0 +1,108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-2.6.25_part2.dpatch by Stefan Lippers-Hollmann <s.l-h at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix building virtualbox-ose-modules against kernel 2.6.25
+## DP: taken from SUN/ Innotek upstream SVN r7550:
+## DP: "attempt to fix vfsmod for Linux >= 2.6.25"
+
+ at DPATCH@
+diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/dirops.c virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/dirops.c
+--- virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/dirops.c 2008-02-19 12:49:06.000000000 +0100
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/dirops.c 2008-04-28 21:24:26.000000000 +0200
+@@ -286,7 +286,11 @@
+ }
+
+ ino = iunique (parent->i_sb, 1);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
++ inode = iget_locked (parent->i_sb, ino);
++#else
+ inode = iget (parent->i_sb, ino);
++#endif
+ if (!inode) {
+ elog2 ("iget failed\n");
+ err = -ENOMEM; /* XXX: ??? */
+@@ -296,6 +300,10 @@
+ SET_INODE_INFO (inode, sf_new_i);
+ sf_init_inode (sf_g, inode, &fsinfo);
+ sf_new_i->path = path;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
++ unlock_new_inode(inode);
++#endif
+ }
+
+ sf_i->force_restat = 0;
+@@ -338,7 +346,11 @@
+ }
+
+ ino = iunique (parent->i_sb, 1);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
++ inode = iget_locked (parent->i_sb, ino);
++#else
+ inode = iget (parent->i_sb, ino);
++#endif
+ if (!inode) {
+ elog3 ("%s: %s: iget failed\n", caller, __func__);
+ err = -ENOMEM;
+@@ -354,6 +366,11 @@
+ sf_new_i->force_restat = 1;
+
+ d_instantiate (dentry, inode);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
++ unlock_new_inode(inode);
++#endif
++
+ return 0;
+
+ fail1:
+diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/vfsmod.c virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+--- virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2007-12-12 16:13:12.000000000 +0100
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2008-04-28 21:26:42.000000000 +0200
+@@ -257,7 +257,11 @@
+ sb->s_blocksize = 1024;
+ sb->s_op = &sf_super_ops;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
++ iroot = iget_locked (sb, 0);
++#else
+ iroot = iget (sb, 0);
++#endif
+ if (!iroot) {
+ err = -ENOMEM; /* XXX */
+ elog2 ("could not get root inode\n");
+@@ -267,6 +271,10 @@
+ sf_init_inode (sf_g, iroot, &fsinfo);
+ SET_INODE_INFO (iroot, sf_i);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
++ unlock_new_inode(iroot);
++#endif
++
+ droot = d_alloc_root (iroot);
+ if (!droot) {
+ err = -ENOMEM; /* XXX */
+@@ -329,10 +337,12 @@
+ the only thing that is known about inode at this point is its index
+ hence we can't do anything here, and let lookup/whatever with the
+ job to properly fill then [inode] */
++#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25)
+ static void
+ sf_read_inode (struct inode *inode)
+ {
+ }
++#endif
+
+ /* vfs is done with [sb] (umount called) call [sf_glob_free] to unmap
+ the folder and free [sf_g] */
+@@ -370,7 +380,9 @@
+
+ static struct super_operations sf_super_ops = {
+ .clear_inode = sf_clear_inode,
++#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25)
+ .read_inode = sf_read_inode,
++#endif
+ .put_super = sf_put_super,
+ .statfs = sf_statfs,
+ .remount_fs = sf_remount_fs
Modified: tags/1.5.6-dfsg-7/debian/patches/08-init-fail.dpatch
===================================================================
--- tags/1.5.6-dfsg-6/debian/patches/08-init-fail.dpatch 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/patches/08-init-fail.dpatch 2008-05-11 21:03:26 UTC (rev 280)
@@ -2,7 +2,7 @@
## 08-init-fail.dpatch by Michael Meskes <meskes at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove created file on failure
+## DP: Fix some failures in init script.
@DPATCH@
diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose-1.5.6-dfsg/src/VBox/Installer/linux/vboxnet.sh
@@ -15,4 +15,21 @@
+ [ -f "$VARFILE" ] && rm $VARFILE
echo " ...fail!"
}
-
+
+@@ -226,13 +226,13 @@
+ then
+ if brctl addif "$3" "$1" 2> /dev/null
+ then
+- echo "$1 $2 $3" > "$VARFILE"
++ echo "$1 $2 $3" >> "$VARFILE"
+ else
+- echo "$1 $2" > "$VARFILE"
++ echo "$1 $2" >> "$VARFILE"
+ echo "Warning - failed to add interface $1 to the bridge $3"
+ fi
+ else
+- echo "$1 $2" > $VARFILE
++ echo "$1 $2" >> $VARFILE
+ fi
+ i=20
+ else
Modified: tags/1.5.6-dfsg-7/debian/po/cs.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/cs.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/cs.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,7 +1,6 @@
# Czech translation of virtualbox-ose debconf messages.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 2008 Miroslav Kure <kurem at debian.cz>
# This file is distributed under the same license as the virtualbox-ose package.
-# Miroslav Kure <kurem at debian.cz>, 2008
#
msgid ""
msgstr ""
@@ -12,7 +11,7 @@
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/es.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/es.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/es.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,4 +1,4 @@
-# virtualbox-ose translation to spanish
+# Spanish translation of virtualbox-ose debconf templates.
# Copyright (C) 2008 Software in the Public Interest, SPI Inc.
# This file is distributed under the same license as the virtualbox-ose package.
#
@@ -6,8 +6,7 @@
# - Initial translation
# Fernando C. Estrada , 2008
#
-#
-# Traductores, si no conoce el formato PO, merece la pena leer la
+# Traductores, si no conoce el formato PO, merece la pena leer la
# documentación de gettext, especialmente las secciones dedicadas a este
# formato, por ejemplo ejecutando:
# info -n '(gettext)PO Files'
@@ -38,7 +37,7 @@
"Last-Translator: Fernando C. Estrada <fcestrada at fcestrada.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/eu.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/eu.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/eu.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,8 +1,7 @@
-# translation of eu.po to Euskara
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Euskarian translation of virtualbox-ose debconf templates.
+# 2008 Piarres Beobide <pi at beobide.net>
+# This file is distributed under the same license as the virtualbox-ose package.
#
-# Piarres Beobide <pi at beobide.net>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: eu\n"
@@ -12,7 +11,7 @@
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Euskara <Librezale at librezale.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
Modified: tags/1.5.6-dfsg-7/debian/po/fi.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/fi.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/fi.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,3 +1,7 @@
+# Finnish translation of virtualbox-ose debconf templates.
+# 2008 Esko Arajärvi <edu at iki.fi>
+# This file is distributed under the same license as the virtualbox-ose package.
+#
msgid ""
msgstr ""
"Project-Id-Version: virtualbox-ose\n"
@@ -7,7 +11,7 @@
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debia.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
Modified: tags/1.5.6-dfsg-7/debian/po/fr.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/fr.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/fr.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,9 +1,7 @@
-# Translation of virtualbox-ose debconf templates to French
+# French translation of virtualbox-ose debconf templates.
# Copyright (C) 2008 David Kremer <david.kremer.dk at gmail.com>
# This file is distributed under the same license as the virtualbox-ose package.
#
-# David Kremer <david.kremer.dk at gmail.com>, 2008.
-#
msgid ""
msgstr ""
"Project-Id-Version: virtualbox-ose-20080204.relu-bubulle\n"
@@ -13,7 +11,7 @@
"Last-Translator: David Kremer <david.kremer.dk at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
Modified: tags/1.5.6-dfsg-7/debian/po/gl.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/gl.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/gl.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,6 +1,6 @@
-# Galician translation of virtualbox-ose's debconf templates
+# Galician translation of virtualbox-ose debconf templates.
+# 2008 Jacobo Tarrio <jtarrio at debian.org>
# This file is distributed under the same license as the virtualbox-ose package.
-# Jacobo Tarrio <jtarrio at debian.org>, 2008.
#
msgid ""
msgstr ""
@@ -11,7 +11,7 @@
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/it.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/it.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/it.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,7 +1,7 @@
-# Italian translation of the virtualbox-ose debconf template
-# This file is distributed under the same license as the virtualbox-ose package
+# Italian translation of virtualbox-ose debconf templates.
+# 2008 Luca Monducci <luca.mo at tiscali.it>
# Copyright (C) 2008 Free Software Foundation, Inc.
-# Luca Monducci <luca.mo at tiscali.it>, 2008.
+# This file is distributed under the same license as the virtualbox-ose package.
#
msgid ""
msgstr ""
@@ -12,7 +12,7 @@
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/ja.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/ja.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/ja.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,6 +1,6 @@
-# Copyright (C) 2008 Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
+# Japanese translation of virtualbox-ose debconf templates.
+# 2008 Hideki Yamane <henrich at debian.or.jp>
# This file is distributed under the same license as the virtualbox-ose package.
-# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2008.
#
msgid ""
msgstr ""
@@ -11,7 +11,7 @@
"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/nl.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/nl.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/nl.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,7 +1,6 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Dutch translation of virtualbox-ose debconf templates.
+# 2008 Bart Cornelis <cobaco at skolelinux.no>
+# This file is distributed under the same license as the virtualbox-ose package.
#
msgid ""
msgstr ""
Modified: tags/1.5.6-dfsg-7/debian/po/pt.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/pt.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/pt.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,7 +1,6 @@
-# Portuguese translation of virtualbox-ose's debconf templates.
-# Copyright (C) 2008
+# Portuguese translation of virtualbox-ose debconf templates.
+# 2008 Ricardo Silva <ardoric at gmail.com>
# This file is distributed under the same license as the virtualbox-ose package.
-# Ricardo Silva <ardoric at gmail.com>, 2008.
#
msgid ""
msgstr ""
@@ -12,7 +11,7 @@
"Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/pt_BR.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/pt_BR.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/pt_BR.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,7 +1,6 @@
-# virtualbox-ose Brazilian Portuguese translation
-# Copyright (c) 2008 virtualbox-ose's COPYRIGHT HOLDER
+# Brazilian Portuguese translation of virtualbox-ose debconf templates.
+# 2008 Eder L. Marques <frolic at debian-ce.org>
# This file is distributed under the same license as the virtualbox-ose package.
-# Eder L. Marques (frolic) <frolic at debian-ce.org>, 2008.
#
msgid ""
msgstr ""
@@ -12,7 +11,7 @@
"Last-Translator: Eder L. Marques (frolic) <frolic at debian-ce.org>\n"
"Language-Team: l10n Portuguese <debian-l10n-portuguese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"pt_BR utf-8\n"
"X-Generator: KBabel 1.11.4\n"
Modified: tags/1.5.6-dfsg-7/debian/po/ru.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/ru.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/ru.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,8 +1,7 @@
-# translation of ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Russian translation of virtualbox-ose debconf templates.
+# 2008 Yuri Kozlov <kozlov.y at gmail.com>
+# This file is distributed under the same license as the virtualbox-ose package.
#
-# Yuri Kozlov <kozlov.y at gmail.com>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: 1.5.4-dfsg-3\n"
@@ -12,7 +11,7 @@
"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
Modified: tags/1.5.6-dfsg-7/debian/po/templates.pot
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/templates.pot 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/templates.pot 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,7 +1,6 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# LANGUAGE translation of virtualbox-ose debconf templates.
+# Copyright (C) 2008 FULL NAME <EMAIL at ADDRESS>
+# This file is distributed under the same license as the virtualbox-ose package.
#
msgid ""
msgstr ""
@@ -12,7 +11,7 @@
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
Modified: tags/1.5.6-dfsg-7/debian/po/vi.po
===================================================================
--- tags/1.5.6-dfsg-6/debian/po/vi.po 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/po/vi.po 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,6 +1,7 @@
-# Vietnamese translation for Virtual Box OSE.
-# Copyright © 2008 Free Software Foundation, Inc.
-# Clytie Siddall <clytie at riverland.net.au>, 2008.
+# Vietnamese translation of virtualbox-ose debconf templates.
+# 2008 Clytie Siddall <clytie at riverland.net.au>
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the virtualbox-ose package.
#
msgid ""
msgstr ""
@@ -11,7 +12,7 @@
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.7b1\n"
Modified: tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.README.Debian
===================================================================
--- tags/1.5.6-dfsg-6/debian/virtualbox-ose-guest-source.README.Debian 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.README.Debian 2008-05-11 21:03:26 UTC (rev 280)
@@ -3,7 +3,7 @@
The Debian virtualbox-ose-guest-source package can be used in several ways,
- - Using module-assistant(1) commands provided by the module-assistant Debian
+ - Using module-assistant(8) commands provided by the module-assistant Debian
package:
# module-assistant prepare virtualbox-ose-guest
Modified: tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files/control.modules.in
===================================================================
--- tags/1.5.6-dfsg-6/debian/virtualbox-ose-guest-source.files/control.modules.in 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files/control.modules.in 2008-05-11 21:03:26 UTC (rev 280)
@@ -12,6 +12,7 @@
Package: virtualbox-ose-guest-modules-_KVERS_
Architecture: i386
Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
+Recommends: virtualbox-ose-guest-utils
Provides: virtualbox-ose-guest-modules
Description: VirtualBox guest addition modules for Linux (kernel _KVERS_)
This package contains the set of loadable kernel modules for VirtualBox Guest Additions.
Modified: tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files/rules
===================================================================
--- tags/1.5.6-dfsg-6/debian/virtualbox-ose-guest-source.files/rules 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/virtualbox-ose-guest-source.files/rules 2008-05-11 21:03:26 UTC (rev 280)
@@ -54,8 +54,8 @@
dh_clean -k
# Build the modules
- (cd vboxadd; $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC))
- (cd vboxvfs; $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC))
+ $(MAKE) -C $(KSRC) M=$(CURDIR)/vboxadd
+ $(MAKE) -C $(KSRC) M=$(CURDIR)/vboxvfs
# Install the modules
dh_install vboxadd/vboxadd.ko /lib/modules/$(KVERS)/misc/
Modified: tags/1.5.6-dfsg-7/debian/virtualbox-ose-source.README.Debian
===================================================================
--- tags/1.5.6-dfsg-6/debian/virtualbox-ose-source.README.Debian 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/virtualbox-ose-source.README.Debian 2008-05-11 21:03:26 UTC (rev 280)
@@ -3,7 +3,7 @@
The Debian virtualbox-ose-source package can be used in several ways,
- - Using module-assistant(1) commands provided by the module-assistant Debian
+ - Using module-assistant(8) commands provided by the module-assistant Debian
package:
# module-assistant prepare virtualbox-ose
Modified: tags/1.5.6-dfsg-7/debian/virtualbox-ose-source.files/rules
===================================================================
--- tags/1.5.6-dfsg-6/debian/virtualbox-ose-source.files/rules 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/virtualbox-ose-source.files/rules 2008-05-11 21:03:26 UTC (rev 280)
@@ -35,18 +35,6 @@
# compiler), VERSION (the final package version string), PKGNAME (full
# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
-# Set ARCH so we can cross compile Debian kernel
-ARCH := `uname -m`
-ifneq ($(shell echo $(ARCH) | grep 86), )
- ARCH := i386
-endif
-ifneq ($(shell echo $(KVERS) | grep 86), )
- ARCH := i386
-endif
-ifneq ($(shell echo $(KVERS) | grep amd64), )
- ARCH := x86_64
-endif
-
# The kdist_configure target is called by make-kpkg modules_config and
# by kdist* rules by dependency. It should configure the module so it is
# ready for compilation (mostly useful for calling configure).
@@ -68,7 +56,7 @@
dh_clean -k
# Build the module
- $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC) ARCH=$(ARCH)
+ $(MAKE) -C $(KSRC) M=$(CURDIR)
# Install the module
dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
Modified: tags/1.5.6-dfsg-7/debian/virtualbox-ose.docs
===================================================================
--- tags/1.5.6-dfsg-6/debian/virtualbox-ose.docs 2008-05-10 08:02:19 UTC (rev 279)
+++ tags/1.5.6-dfsg-7/debian/virtualbox-ose.docs 2008-05-11 21:03:26 UTC (rev 280)
@@ -1,2 +1 @@
debian/README.Debian.html
-
More information about the Pkg-virtualbox-commits
mailing list