[kernel] r17830 - in dists/trunk/linux-2.6: . debian debian/config/armhf debian/config/i386 debian/config/mipsel debian/po debian/templates
Ben Hutchings
benh at alioth.debian.org
Tue Jul 12 05:25:25 UTC 2011
Author: benh
Date: Tue Jul 12 05:25:23 2011
New Revision: 17830
Log:
Merge changes from sid up to 2.6.39-3
Added:
dists/trunk/linux-2.6/debian/config/armhf/config.omap
- copied unchanged from r17798, dists/sid/linux-2.6/debian/config/armhf/config.omap
dists/trunk/linux-2.6/debian/po/sk.po
- copied unchanged from r17798, dists/sid/linux-2.6/debian/po/sk.po
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/armhf/defines
dists/trunk/linux-2.6/debian/config/i386/defines
dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f
dists/trunk/linux-2.6/debian/po/da.po
dists/trunk/linux-2.6/debian/po/fr.po
dists/trunk/linux-2.6/debian/po/sv.po
dists/trunk/linux-2.6/debian/po/templates.pot
dists/trunk/linux-2.6/debian/templates/control.main.in
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/changelog Tue Jul 12 05:25:23 2011 (r17830)
@@ -177,6 +177,93 @@
-- Ben Hutchings <ben at decadent.org.uk> Wed, 01 Jun 2011 06:41:14 +0100
+linux-2.6 (2.6.39-3) unstable; urgency=low
+
+ [ Ben Hutchings ]
+ * [x86] i915: Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
+ (Closes: #627575)
+ * linux-source-<version>: Suggest libqt4-dev (for 'make xconfig')
+ instead of libqt3-mt-dev (Closes: #631666)
+ * [armhf] Add omap flavour, thanks to Sebastian Reichel
+ * [armhf] rtc-twl: Switch to using threaded irq
+ * bridge/netfilter: provide a cow_metrics method for fake_ops
+ (Closes: #629932)
+ * Update debconf template translations:
+ - Danish (Joe Dalton) (Closes: #632551)
+ - Slovak (Slavko) (Closes: #608684)
+ * partitions/efi: Fix crash (oops) caused by corrupted GUID partition
+ table (CVE-2011-1577)
+ * ksm: fix NULL pointer dereference in scan_get_next_rmap_item()
+ (CVE-2011-2183)
+ * inet_diag: Fix infinite loop in inet_diag_bc_audit() (CVE-2011-2213)
+ * taskstats: don't allow duplicate entries in listener mode (CVE-2011-2484)
+ * bluetooth: Prevent buffer overflow in l2cap config request
+ (CVE-2011-2497)
+
+ [ maximilian attems ]
+ * Add stable 2.6.39.2, including:
+ - block: Fix crash (oops) in blkdev_get() on failed exclusive open
+ (Closes: #631574)
+ - nl80211: fix check for valid SSID size in scan operations (CVE-2011-2517)
+ - drm/radeon/kms: viewport height has to be even
+ - drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu
+ - fat: Fix corrupt inode flags when remove ATTR_SYS flag
+ - scsi: Fix oops caused by queue refcounting failure
+ - cifs: don't allow cifs_reconnect to exit with NULL socket pointer
+ - drm/radeon/kms: do bounds checking for 3D_LOAD_VBPNTR and bump array
+ limit
+ - TOMOYO: Fix oops in tomoyo_mount_acl() (CVE-2011-2518)
+ For the complete list of changes, see:
+ http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.2
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 04 Jul 2011 07:08:10 +0100
+
+linux-2.6 (2.6.39-2) unstable; urgency=low
+
+ [ Ben Hutchings ]
+ * [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
+ (Closes: #627492)
+ * cgroups: Disable memory resource controller by default. Allow it
+ to be enabled using kernel parameter 'cgroup_enable=memory'.
+ * rt2800usb: Enable support for more USB devices including
+ Linksys WUSB600N (Closes: #596626) (this change was accidentally
+ omitted from 2.6.39-1)
+ * [x86] Remove Celeron from list of processors supporting PAE. Most
+ 'Celeron M' models do not.
+ * Update debconf template translations:
+ - Swedish (Martin Bagge) (Closes: #628932)
+ - French (David Prévot) (Closes: #628191)
+ * aufs: Update for 2.6.39 (Closes: #627837)
+ * Add stable 2.6.39.1, including:
+ - ext4: dont set PageUptodate in ext4_end_bio()
+ - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
+ - ext3: Fix fs corruption when make_indexed_dir() fails
+ - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
+ - sctp: fix race between sctp_bind_addr_free() and
+ sctp_bind_addr_conflict()
+ - sctp: fix memory leak of the ASCONF queue when free asoc
+ - md/bitmap: fix saving of events_cleared and other state
+ - cdc_acm: Fix oops when Droids MuIn LCD is connected
+ - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
+ - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
+ - tmpfs: fix race between truncate and writepage
+ - nfs41: Correct offset for LAYOUTCOMMIT
+ - xen/mmu: fix a race window causing leave_mm BUG()
+ - ext4: fix possible use-after-free in ext4_remove_li_request()
+ For the complete list of changes, see:
+ http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
+ * Bump ABI to 2
+ * netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
+ IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
+ IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
+ IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
+ (Closes: #629401)
+
+ [ Aurelien Jarno ]
+ * [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 07 Jun 2011 12:14:05 +0100
+
linux-2.6 (2.6.39-1) unstable; urgency=low
[ maximilian attems ]
Copied: dists/trunk/linux-2.6/debian/config/armhf/config.omap (from r17798, dists/sid/linux-2.6/debian/config/armhf/config.omap)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.omap Tue Jul 12 05:25:23 2011 (r17830, copy of r17798, dists/sid/linux-2.6/debian/config/armhf/config.omap)
@@ -0,0 +1,335 @@
+##
+## file: arch/arm/Kconfig
+##
+## choice: ARM system type
+CONFIG_ARCH_OMAP=y
+## end choice
+CONFIG_NEON=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_HIGHMEM=y
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+
+##
+## file: arch/arm/mm/Kconfig
+##
+CONFIG_ARM_THUMBEE=y
+
+##
+## file: arch/arm/plat-omap/Kconfig
+##
+## choice: OMAP system type
+CONFIG_ARCH_OMAP2PLUS=y
+## end choice
+# CONFIG_OMAP_DEBUG_DEVICES is not set
+CONFIG_OMAP_DEBUG_LEDS=y
+CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+CONFIG_OMAP_MCBSP=y
+CONFIG_OMAP_MBOX_FWK=y
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_IOMMU=y
+# CONFIG_OMAP_IOMMU_DEBUG is not set
+## choice: System timer
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+## end choice
+# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
+CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_SERIAL_WAKE=y
+## choice: OMAP PM layer selection
+# CONFIG_OMAP_PM_NONE is not set
+CONFIG_OMAP_PM_NOOP=y
+## end choice
+
+##
+## file: arch/arm/mach-omap2/Kconfig
+##
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+# CONFIG_ARCH_OMAP2 is not set
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_GPIO=y
+CONFIG_I2C_OMAP=y
+
+##
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_SPIDEV=y
+
+##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_TWL4030=y
+
+##
+## file: drivers/usb/Kconfig
+## note: needed to be buildin by MUSB
+##
+CONFIG_USB=y
+
+##
+## file: drivers/usb/musb/Kconfig
+##
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_OTG=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC_HCD=y
+
+##
+## file: drivers/usb/gadget/Kconfig
+##
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_G_NOKIA=m
+
+##
+## file: drivers/usb/otg/Kconfig
+##
+CONFIG_USB_OTG_UTILS=y
+CONFIG_TWL4030_USB=y
+CONFIG_TWL6030_USB=y
+CONFIG_NOP_USB_XCEIV=y
+
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_OMAP3=y
+
+##
+## file: drivers/leds/Kconfig
+##
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_LP5523=m
+
+##
+## file: drivers/cpufreq/Kconfig
+##
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+
+##
+## file: drivers/crypto/Kconfig
+##
+CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+CONFIG_CRYPTO_DEV_OMAP_AES=m
+
+##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+
+##
+## file: drivers/video/Kconfig
+##
+CONFIG_FB=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+
+##
+## file: drivers/video/omap/Kconfig
+##
+CONFIG_FB_OMAP_BOOTLOADER_INIT=y
+
+##
+## file: drivers/video/omap2/Kconfig
+##
+CONFIG_OMAP2_VRAM=y
+CONFIG_OMAP2_VRFB=y
+
+##
+## file: drivers/video/omap2/dss/Kconfig
+##
+CONFIG_OMAP2_DSS=y
+CONFIG_OMAP2_DSS_VENC=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
+
+##
+## file: drivers/video/omap2/omapfb/Kconfig
+##
+CONFIG_FB_OMAP2=y
+
+##
+## file: drivers/video/omap/displays/Kconfig
+##
+CONFIG_PANEL_GENERIC_DPI=y
+CONFIG_PANEL_ACX565AKM=y
+
+##
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_TWL4030=y
+CONFIG_KEYBOARD_OMAP4=y
+
+##
+## file: drivers/input/misc/Kconfig
+##
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+
+##
+## file: drivers/input/touchscreen/Kconfig
+##
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2005=m
+
+##
+## file: drivers/regulator/Kconfig
+##
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_TWL4030=y
+
+##
+## drivers/media/video/omap/Kconfig
+##
+CONFIG_VIDEO_OMAP2_VOUT=m
+
+##
+## file: drivers/staging/iio/Kconfig
+##
+CONFIG_IIO=m
+
+##
+## file: drivers/staging/iio/light/Kconfig
+##
+CONFIG_SENSORS_TSL2563=m
+
+##
+## file: drivers/staging/iio/accel/Kconfig
+##
+CONFIG_LIS3L02DQ=m
+
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_TWL4030=m
+
+##
+## file: drivers/net/wireless/wl12xx/Kconfig
+##
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+
+##
+## file: sound/soc/Kconfig
+##
+CONFIG_SND_SOC=m
+
+##
+## file: sound/soc/omap/Kconfig
+##
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_RX51=m
+CONFIG_SND_OMAP_SOC_SDP4430=m
+
+##
+## file: net/phonet/Kconfig
+##
+CONFIG_PHONET=m
+
+##
+## file: drivers/power/Kconfig
+##
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_CHARGER_ISP1704=m
+
+##
+## file: drivers/staging/tidspbridge/Kconfig
+##
+CONFIG_TIDSPBRIDGE=m
+CONFIG_TIDSPBRIDGE_DVFS=y
+CONFIG_TIDSPBRIDGE_RECOVERY=y
+
+##
+## file: drivers/mmc/Kconfig
+##
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=m
+
+##
+## file: drivers/mmc/host/Kconfig
+##
+CONFIG_MMC_OMAP=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_SPI=m
+
+##
+## file: drivers/mtd/Kconfig
+##
+CONFIG_MTD=y
+
+##
+## file: drivers/mtd/nand/Kconfig
+##
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_OMAP2=y
+
+##
+## file: drivers/mtd/onenand/Kconfig
+##
+CONFIG_MTD_ONENAND=y
+CONFIG_MTD_ONENAND_OMAP2=y
+
+##
+## file: kernel/power/Kconfig
+##
+CONFIG_PM=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_RUNTIME=y
+
+##
+## file: drivers/media/Kconfig
+##
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+
+##
+## file: drivers/media/radio/Kconfig
+##
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+
+##
+## file: drivers/misc/ti-st/Kconfig
+##
+CONFIG_TI_ST=m
+
+##
+## file: drivers/bluetooth/Kconfig
+##
+CONFIG_BT_WILINK=m
Modified: dists/trunk/linux-2.6/debian/config/armhf/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/defines Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/config/armhf/defines Tue Jul 12 05:25:23 2011 (r17830)
@@ -1,6 +1,7 @@
[base]
flavours:
mx5
+ omap
kernel-arch: arm
[image]
@@ -15,3 +16,13 @@
[mx5_description]
hardware: Freescale MXC/iMX-based
hardware-long: Support for Freescale MXC/iMX-based family of processors
+
+[omap_build]
+image-file: arch/arm/boot/zImage
+
+[omap_description]
+hardware: TI OMAP3+
+hardware-long: Texas Instruments OMAP3 or OMAP4 based systems
+
+[omap_image]
+recommends: uboot-mkimage
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Tue Jul 12 05:25:23 2011 (r17830)
@@ -8,8 +8,8 @@
[description]
part-long-pae: This kernel requires PAE (Physical Address Extension).
This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
- Celeron, Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
- Turion or Phenom; Transmeta Efficeon; and VIA C7.
+ Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
+ Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.
[image]
bootloaders: grub-pc extlinux lilo
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.loongson-2f Tue Jul 12 05:25:23 2011 (r17830)
@@ -57,6 +57,7 @@
##
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
+# CONFIG_SCSI_LPFC is not set
##
## file: drivers/staging/sm7xx/Kconfig
Modified: dists/trunk/linux-2.6/debian/po/da.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/da.po Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/po/da.po Tue Jul 12 05:25:23 2011 (r17830)
@@ -1,14 +1,14 @@
# Danish translation linux-2.6.
-# Copyright (C) 2010 linux-2.6 & Joe Hansen.
+# Copyright (C) 2011 linux-2.6 & Joe Hansen.
# This file is distributed under the same license as the linux-2.6 package.
-# Joe Hansen <joedalton2 at yahoo.dk>, 2010.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-10-01 10:30+0200\n"
-"PO-Revision-Date: 2010-10-07 05:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-09 10:31+0200\n"
+"PO-Revision-Date: 2011-07-03 05:26+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
"Language: da\n"
@@ -16,21 +16,6 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d. "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
-"Hvis opstartsindlæseren (boot loader) skal opdateres, når en ny kerne er "
-"installeret, bør opstartsindlæserens pakke installere et skript i "
-"/etc/kernel/postinst.d. Alternativt kan du angive kommandoen til opdatering "
-"af opstartsindlæseren ved at angive variablen 'postinst_hook' i "
-"/etc/kernel-img.conf."
-
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
@@ -143,15 +128,18 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
-msgstr "Konfiguration af opstartsindlæseren (boot loader) skal opdateres"
+msgid "Ramdisk configuration must be updated"
+msgstr "Konfiguration af ramdisk skal opdateres"
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Kernepakker opdaterer ikke længere en standardopstartsindlæser (boot loader). "
-"Du bør fjerne 'do_bootloader = yes' fra /etc/kernel-img.conf."
+"Kernel packages will no longer run a specific ramdisk creator. The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
+msgstr ""
+"Kernepakker vil ikke længere køre et specifikt ramdiskoprettelsesprogram. "
+"Pakken for ramdiskrettelsesprogrammet skal installere et skript i /etc/kernel"
+"/postinst.d, og du skal fjerne linjen der begynder med »ramdisk =« fra "
+"/etc/kernel-img.conf."
Modified: dists/trunk/linux-2.6/debian/po/fr.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/fr.po Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/po/fr.po Tue Jul 12 05:25:23 2011 (r17830)
@@ -1,14 +1,14 @@
# Translation of linux-2.6 debconf templates to French
-# Copyright (C) 2010 Debian French l10n team <debian-l10n-french at lists.debian.org>
+# Copyright (C) 2010, 2011 Debian French l10n team <debian-l10n-french at lists.debian.org>
# This file is distributed under the same license as the linux-2.6 package.
#
-# David Prévot <david at tilapin.org>, 2010.
+# David Prévot <david at tilapin.org>, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
-"PO-Revision-Date: 2010-07-26 12:24-0400\n"
+"Project-Id-Version: linux-2.6 2.6.39-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-21 10:31+0200\n"
+"PO-Revision-Date: 2011-05-22 08:48-0400\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"Language: fr\n"
@@ -18,21 +18,6 @@
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d. "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
-"Si le programme d'amorçage doit être mis à jour à chaque fois qu'un nouveau "
-"noyau est installé, le paquet du programme d'amorçage doit installer un script "
-"dans /etc/kernel/postinst.d. Sinon, vous pouvez indiquer la commande de mise à "
-"jour du programme d'amorçage en configurant la variable « postinst_hook » dans "
-"/etc/kernel-img.conf."
-
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
@@ -46,7 +31,7 @@
"The 'depmod' command exited with the exit code ${exit_value} "
"(${SIGNAL}${CORE})."
msgstr ""
-"La commande depmod s'est terminée avec le code de sortie ${exit_value} "
+"La commande depmod s'est terminée avec le code de retour ${exit_value} "
"(${SIGNAL} ${CORE})."
#. Type: boolean
@@ -148,17 +133,18 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-#| msgid "Boot loader configuration check needed"
-msgid "Boot loader configuration must be updated"
-msgstr "Mise à jour indispensable de la configuration du programme d'amorçage"
+msgid "Ramdisk configuration must be updated"
+msgstr "Mise à jour indispensable de la configuration du disque virtuel initial"
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Les paquets du noyau ne s'occupent plus de la mise à jour d'un programme "
-"d'amorçage par défaut. Vous devriez enlever 'do_bootloader = yes' de "
-"/etc/kernel-img.conf."
+"Kernel packages will no longer run a specific ramdisk creator. The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
+msgstr ""
+"Les paquets du noyau ne s'occupent plus de la création du disque virtuel "
+"(RAM disque). Le programme en charge de la création du disque virtuel "
+"doivent installer un script dans /etc/kernel/postinst.d, et vous devriez "
+"supprimer la ligne commençant par « ramdisk = » de /etc/kernel-img.conf."
Copied: dists/trunk/linux-2.6/debian/po/sk.po (from r17798, dists/sid/linux-2.6/debian/po/sk.po)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/po/sk.po Tue Jul 12 05:25:23 2011 (r17830, copy of r17798, dists/sid/linux-2.6/debian/po/sk.po)
@@ -0,0 +1,142 @@
+# Slovak translations for linux-2.6 package
+# Slovenské preklady pre balík linux-2.6.
+# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the linux-2.6 package.
+# Slavko <linux at slavino.sk>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-2.6 2.6.32-29\n"
+"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"POT-Creation-Date: 2011-07-04 04:24+0100\n"
+"PO-Revision-Date: 2011-01-02 18:11+0100\n"
+"Last-Translator: Slavko <linux at slavino.sk>\n"
+"Language-Team: Slovak <nomail>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid "Abort installation after depmod error?"
+msgstr "Prerušiť inštaláciu po chybe depmod?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"The 'depmod' command exited with the exit code ${exit_value} "
+"(${SIGNAL}${CORE})."
+msgstr ""
+"Príkaz „depmod” skončil s návratovým kódom ${exit_value} (${SIGNAL}${CORE})."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
+"not be deleted, even though it may be invalid."
+msgstr ""
+"Keďže tento obraz používa initrd, nebude súbor ${modules_base}/=V/modules."
+"dep zmazaný, hoci môže byť neplatný."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"You should abort the installation and fix the errors in depmod, or "
+"regenerate the initrd image with a known good modules.dep file. If you don't "
+"abort the installation, there is a danger that the system will fail to boot."
+msgstr ""
+"Mali by ste prerušiť inštaláciu a opraviť chyby v depmod, alebo znova "
+"vytvoriť obraz initrd s funkčným súborom modules.dep. Ak teraz neprerušíte "
+"inštaláciu, môže sa stať, že sa nepodarí zaviesť systém."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid "Abort kernel removal?"
+msgstr "Prerušiť odstraňovanie jadra?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"You are running a kernel (version ${running}) and attempting to remove the "
+"same version."
+msgstr ""
+"Pokúšate sa odstrániť rovnakú verziu jadra, akú práve používate (version "
+"${running})."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"This can make the system unbootable as it will remove /boot/vmlinuz-"
+"${running} and all modules under the directory /lib/modules/${running}. This "
+"can only be fixed with a copy of the kernel image and the corresponding "
+"modules."
+msgstr ""
+"Toto môže spôsobiť, že sa systém nezavedie, pretože bude odstránený /boot/"
+"vmlinuz-${running} a všetky moduly z adresára /lib/modules/${running}. "
+"Opravené to môže byť len prekopírovaním obrazu jadra a príslušných modulov."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"It is highly recommended to abort the kernel removal unless you are prepared "
+"to fix the system after removal."
+msgstr ""
+"Je veľmi odporúčané prerušiť odstraňovanie jadra, pokiaľ nie ste pripravený "
+"na opravu systému po jeho odstránení."
+
+#. Type: note
+#. Description
+#: ../templates/temp.image.plain/templates:4001
+msgid "Required firmware files may be missing"
+msgstr "Vyžadované súbory s firmware môžu chýbať"
+
+#. Type: note
+#. Description
+#: ../templates/temp.image.plain/templates:4001
+msgid ""
+"This system is currently running Linux ${runningversion} and you are "
+"installing Linux ${version}. In the new version some of the drivers used on "
+"this system may require additional firmware files:"
+msgstr ""
+"Tento systém práve používa Linux ${runningversion} a vy inštalujete Linux "
+"${version}. V novej verzii môžu niektoré ovládače používané týmto systémom "
+"vyžadovať dodatočné súbory s firmware:"
+
+#. Type: note
+#. Description
+#: ../templates/temp.image.plain/templates:4001
+msgid ""
+"Most firmware files are not included in the system because they do not "
+"conform to the Debian Free Software Guidelines. You may need to reconfigure "
+"the package manager to include the contrib and non-free sections of the "
+"package archive before you can install these firmware files."
+msgstr ""
+"Väčšina súborov s firmware nie je v systéme zahrnutá, pretože nie sú v "
+"súlade so Zásadami slobodného softvéru Debianu. Pred inštaláciou týchto "
+"súborov s firmware, budete možno musieť nastaviť správcu balíkov tak, aby "
+"zahŕňal sekcie archívu balíkov contrib a non-free."
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid "Ramdisk configuration must be updated"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid ""
+"Kernel packages will no longer run a specific ramdisk creator. The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
+msgstr ""
Modified: dists/trunk/linux-2.6/debian/po/sv.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/sv.po Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/po/sv.po Tue Jul 12 05:25:23 2011 (r17830)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: linux-2.6\n"
"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
-"PO-Revision-Date: 2010-08-07 05:01+0100\n"
+"POT-Creation-Date: 2011-05-21 10:31+0200\n"
+"PO-Revision-Date: 2011-06-02 14:52+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -18,21 +18,6 @@
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: Sweden\n"
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d. "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
-"Om uppstartshanteraren behöver uppdateras när en ny kärna installeras ska "
-"uppstartshanteraren installera ett skript i /etc/kernel/postinst.d. "
-"Alternativt kan du ange kommandot som används för att uppdatera "
-"uppstartshanteraren genom att sätta variabeln \"postinst_hook\" i /etc/"
-"kernel-img.conf."
-
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
@@ -145,16 +130,17 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-#| msgid "Boot loader configuration check needed"
-msgid "Boot loader configuration must be updated"
-msgstr "Inställningarna för uppstartshanteraren behöver uppdateras"
+msgid "Ramdisk configuration must be updated"
+msgstr "Inställningarna för ramdisk behöver uppdateras"
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
-"Kärnpaket uppdaterar inte längre uppstartshanterare. Du ska ta bort "
-"\"do_bootloader = yes\" från /etc/kernel-img.conf."
+"Kernel packages will no longer run a specific ramdisk creator. The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
+msgstr ""
+"Kärnpaketen kör inte längre en specifik ramdiskskapare. Ramdiskskaparen "
+"måste installera ett skript i /etc/kernel/postinst.d och du ska ta bort "
+"raden som börjar med \"ramdisk=\" från /etc/kernel-img.conf."
Modified: dists/trunk/linux-2.6/debian/po/templates.pot
==============================================================================
--- dists/trunk/linux-2.6/debian/po/templates.pot Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/po/templates.pot Tue Jul 12 05:25:23 2011 (r17830)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
+"POT-Creation-Date: 2011-07-04 04:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,6 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: error
-#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d. "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
-
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
@@ -118,13 +108,14 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-msgid "Boot loader configuration must be updated"
+msgid "Ramdisk configuration must be updated"
msgstr ""
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
+"Kernel packages will no longer run a specific ramdisk creator. The ramdisk "
+"creator package must install a script in /etc/kernel/postinst.d, and you "
+"should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
msgstr ""
Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in Tue Jul 12 03:59:50 2011 (r17829)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in Tue Jul 12 05:25:23 2011 (r17830)
@@ -16,7 +16,7 @@
Provides: linux-source
Depends: binutils, bzip2, ${misc:Depends}
Recommends: libc6-dev | libc-dev, gcc, make
-Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
+Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt4-dev
Description: Linux kernel source for version @version@ with Debian patches
This package provides source code for the Linux kernel version @version at .
This source closely tracks official Linux kernel releases. Debian's
More information about the Kernel-svn-changes
mailing list