[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r6795 - in glibc-package/branches/glibc-2.22/debian: . debhelper.in patches patches/any patches/hurd-i386 po sysdeps



Author: aurel32
Date: 2015-12-10 22:28:07 +0000 (Thu, 10 Dec 2015)
New Revision: 6795

Added:
   glibc-package/branches/glibc-2.22/debian/patches/any/cvs-grantpt-pty-owner.diff
   glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-libpthread-api.diff
Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
   glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
   glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.prerm
   glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.templates
   glibc-package/branches/glibc-2.22/debian/patches/series
   glibc-package/branches/glibc-2.22/debian/po/ar.po
   glibc-package/branches/glibc-2.22/debian/po/ca.po
   glibc-package/branches/glibc-2.22/debian/po/cs.po
   glibc-package/branches/glibc-2.22/debian/po/da.po
   glibc-package/branches/glibc-2.22/debian/po/de.po
   glibc-package/branches/glibc-2.22/debian/po/el.po
   glibc-package/branches/glibc-2.22/debian/po/es.po
   glibc-package/branches/glibc-2.22/debian/po/eu.po
   glibc-package/branches/glibc-2.22/debian/po/fi.po
   glibc-package/branches/glibc-2.22/debian/po/fr.po
   glibc-package/branches/glibc-2.22/debian/po/gl.po
   glibc-package/branches/glibc-2.22/debian/po/hu.po
   glibc-package/branches/glibc-2.22/debian/po/it.po
   glibc-package/branches/glibc-2.22/debian/po/ja.po
   glibc-package/branches/glibc-2.22/debian/po/ko.po
   glibc-package/branches/glibc-2.22/debian/po/lt.po
   glibc-package/branches/glibc-2.22/debian/po/ml.po
   glibc-package/branches/glibc-2.22/debian/po/nb.po
   glibc-package/branches/glibc-2.22/debian/po/nl.po
   glibc-package/branches/glibc-2.22/debian/po/pl.po
   glibc-package/branches/glibc-2.22/debian/po/pt.po
   glibc-package/branches/glibc-2.22/debian/po/pt_BR.po
   glibc-package/branches/glibc-2.22/debian/po/ro.po
   glibc-package/branches/glibc-2.22/debian/po/ru.po
   glibc-package/branches/glibc-2.22/debian/po/sk.po
   glibc-package/branches/glibc-2.22/debian/po/sv.po
   glibc-package/branches/glibc-2.22/debian/po/ta.po
   glibc-package/branches/glibc-2.22/debian/po/templates.pot
   glibc-package/branches/glibc-2.22/debian/po/tr.po
   glibc-package/branches/glibc-2.22/debian/po/uk.po
   glibc-package/branches/glibc-2.22/debian/po/vi.po
   glibc-package/branches/glibc-2.22/debian/po/zh_CN.po
   glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk
   glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk
Log:
Merge from trunk


Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/changelog	2015-12-10 22:28:07 UTC (rev 6795)
@@ -138,6 +138,28 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Wed, 02 Dec 2015 00:06:13 +0100
 
+glibc (2.21-4) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * debian/debhelper.in/libc.{preinst,prerm}: remove code handling the
+    upgrade from squeeze to wheezy, as we don't support squeeze to stretch
+    upgrades. Move tests which might exit with a failure at the beginning.
+  * debian/sysdeps/amd64.mk, debian/sysdeps/i386.mk: downgrade the minimal
+    Linux kernel version to 2.6.32 to support RHEL6 kernels.
+  * debhelper.in/libc.preinst: add a note explainling that pre-3.2 kernel
+    are not officially supported.
+  * debhelper.in/libc.preinst, debhelper.in/libc.templates, po/*: display
+    kernel related notes using debconf if available.
+  * patches/any/cvs-grantpt-pty-owner.diff: new patch from upstream to
+    improve granpt when /dev/pts is not mounted with the correct options.
+    Closes: #806882.
+
+  [ Samuel Thibault ]
+  * patches/hurd-i386/cvs-libpthread-api.diff: New patch, cleans libpthread
+    API. Fixes conflicting declarations between pthread.h and sigthread.h.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 10 Dec 2015 22:34:54 +0100
+
 glibc (2.21-3) unstable; urgency=medium
 
   [ Aurelien Jarno ]

Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst	2015-12-10 22:28:07 UTC (rev 6795)
@@ -99,38 +99,209 @@
     done
 }
 
-# On upgrade, if /lib64 is a symlink, remove it and replace it with a real
-# directory so we can ensure biarch and multiarch packages play nicely
-# together
-remove_lib64_symlink() {
-    ldfile=$(readlink -e RTLD_SO)
-    # Test if libc is of the same architecture as /bin/mv
-    # If not, they almost surely have a multiarch system and we can use
-    # the native ELF interpreter
-    if ! $ldfile /bin/mv --version >/dev/null 2>&1; then
-        interpreter=
-    else
-        interpreter=$ldfile
+if [ "$type" != abort-upgrade ]
+then
+    # Load debconf module if available
+    if [ -f /usr/share/debconf/confmodule ] ; then
+        . /usr/share/debconf/confmodule
     fi
 
-    mkdir /lib64.glibc-new
-    ln -s $ldfile /lib64.glibc-new/$(basename RTLD_SO)
-    # sync before and after the operation to reduce the danger of hosing
-    # the system
-    sync
-    rm -f /lib64
-    $interpreter /bin/mv /lib64.glibc-new /lib64
-    sync
-    rm -f /lib/$(basename RTLD_SO)
-}
+    # See if LD_LIBRARY_PATH contains the traditional /lib, but not the
+    # multiarch path
+    dirs=$(echo $LD_LIBRARY_PATH | sed 's/:/ /g')
+    for dir in $dirs ; do
+        dir=$(readlink -e $dir || true)
+        case "$dir" in
+        /lib)
+            seen_traditional=1
+            ;;
+        SLIBDIR)
+            seen_multiarch=1
+            ;;
+        esac
+    done
+    if test -n "$seen_traditional" && test -z "$seen_multiarch" ; then
+        echo
+        echo "LD_LIBRARY_PATH contains the traditional /lib directory,"
+        echo "but not the multiarch directory SLIBDIR."
+        echo "It is not safe to upgrade the C library in this situation;"
+        echo "please remove the /lib/directory from LD_LIBRARY_PATH and" 
+        echo "try again."
+        echo
+        exit 1
+    fi
 
+    # glibc kernel version check
+    system=`uname -s`
+    if [ "$system" = "Linux" ]
+    then
+        # Test to make sure z < 255, in x.y.z-n form of kernel version
+        # Also make sure we don't trip on x.y.zFOO-n form
+        kernel_rev=$(uname -r | sed 's/\([0-9]*\.\)\{1,2\}\([0-9]*\)\(.*\)/\2/')
+        if [ "$kernel_rev" -ge 255 ]
+        then
+            echo "ERROR: Your kernel version indicates a revision number"
+            echo "of 255 or greater.  Glibc has a number of built in"
+            echo "assumptions that this revision number is less than 255."
+            echo "If you\'ve built your own kernel, please make sure that any"
+            echo "custom version numbers are appended to the upstream"
+            echo "kernel number with a dash or some other delimiter."
+            echo
+            exit 1
+        fi
+
+        # sanity checking for the appropriate kernel on each architecture.
+        kernel_ver=`uname -r`
+        case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
+            amd64|i386)
+                # The GNU libc requires a >= 2.6.32 kernel, found in squeeze or RHEL6
+                kernel_ver_min=2.6.32
+                # But we don't officially support kernels before 3.2
+                kernel_ver_rec=3.2
+                ;;
+            *)
+                # The GNU libc requires a >= 3.2 kernel, found in wheezy
+                kernel_ver_min=3.2
+                kernel_ver_rec=3.2
+                ;;
+        esac
+
+        if linux_compare_versions "$kernel_ver" lt $kernel_ver_min
+        then
+            if [ -f /usr/share/debconf/confmodule ]
+            then
+                db_version 2.0
+                db_fset glibc/kernel-too-old seen false
+                db_reset glibc/kernel-too-old
+                db_subst glibc/kernel-too-old kernel_ver $kernel_ver_rec
+                db_input critical glibc/kernel-too-old || true
+                db_go
+                db_stop
+            else
+                echo "ERROR: This version of the GNU libc requires kernel version"
+                echo "$kernel_ver_rec or later.  Please upgrade your kernel before installing"
+                echo "glibc."
+                echo
+            fi
+            exit 1
+        fi
+
+        if linux_compare_versions "$kernel_ver" lt $kernel_ver_rec
+        then
+            if [ -f /usr/share/debconf/confmodule ]
+            then
+                db_version 2.0
+                db_fset glibc/kernel-not-supported seen false
+                db_reset glibc/kernel-not-supported
+                db_subst glibc/kernel-not-supported kernel_ver $kernel_ver_rec
+                db_input critical glibc/kernel-not-supported || true
+                db_go
+                db_stop
+            else
+                echo "WARNING: This version of the GNU libc requires kernel version"
+                echo "$kernel_ver_rec or later.  Older versions might work but are not officially"
+                echo "supported.  Please consider upgrading your kernel."
+                echo
+            fi
+        fi
+
+    elif [ $system = "GNU/kFreeBSD" ]
+    then
+        kernel_ver=`uname -r`
+        kernel_ver_min=8.3
+        if kfreebsd_compare_versions "$kernel_ver" lt $kernel_ver_min
+        then
+            if [ -f /usr/share/debconf/confmodule ]
+            then
+                db_version 2.0
+                db_version 2.0
+                db_fset glibc/kernel-too-old seen false
+                db_reset glibc/kernel-too-old
+                db_subst glibc/kernel-too-old kernel_ver $kernel_ver_min
+                db_input critical glibc/kernel-too-old || true
+                db_go
+                db_stop
+            else
+                echo "ERROR: This version of the GNU libc requires kernel version"
+                echo "$kernel_ver_min or later.  Please upgrade your kernel before installing"
+                echo "glibc."
+                echo
+            fi
+            exit 1
+        fi
+    fi
+fi
+
 if [ "$type" = upgrade ]
 then
-    # Load debconf module if available
-    if [ -f /usr/share/debconf/confmodule ] ; then
-        . /usr/share/debconf/confmodule
+    # Try to detect copies of the libc library in the various places
+    # the dynamic linker uses.
+    ldfile=$(readlink -m RTLD_SO)
+    if test -f "$file"; then
+        ldbytes=$(head -c 20 RTLD_SO | od -c)
+    else
+        # If the symlink to the dynamic linker is dangling or missing, set
+        # ldbytes to an empty string, the test below will fail and all the
+        # libraries found will be ignored.
+        ldbytes=""
     fi
+    libcfiles=$(dpkg-query -L $(package_name) 2>/dev/null)
 
+    dirs="SLIBDIR /lib /lib/tls /lib32 /lib64 /usr/local/lib /usr/local/lib32 /usr/local/lib64"
+    for dir in $dirs ; do
+        check_dir "in an unexpected directory" $dir
+    done
+
+    if test -n "$LD_LIBRARY_PATH"; then
+        dirs=$(echo $LD_LIBRARY_PATH | sed 's/:/ /g')
+        for dir in $dirs ; do
+            check_dir "via LD_LIBRARY_PATH" $dir
+        done
+    fi
+
+    if test -e /etc/ld.so.conf; then
+        dirs=$(echo $(cat /etc/ld.so.conf))
+        if test -n "$dirs" ; then
+            for dir in $dirs ; do
+                check_dir "via /etc/ld.so.conf" $dir
+            done
+        fi
+    fi
+
+    if [ -e /lib/tls/i686/cmov/libc.so.6 ] || [ -e /lib/i686/cmov/libc.so.6 ] ; then
+        status_i686=$(dpkg -s libc6-i686 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
+        status_xen=$(dpkg -s libc6-xen 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
+        if ([ -z "$status_i686" ] || [ "$status_i686" = "not-installed" ] || [ "$status_i686" = "config-files" ]) && \
+             ([ -z "$status_xen" ] || [ "$status_xen" = "not-installed" ] || [ "$status_xen" = "config-files" ]); then
+            echo
+            echo "A non-dpkg owned copy of the libc6-i686 package was found."
+            echo "It is not safe to upgrade the C library in this situation;"
+            echo "please remove that copy of the C library and try again."
+            echo
+            exit 1
+        fi
+    fi
+
+    # ldconfig might have broken the ld.so symlink in case a biarch package
+    # of the same architecture than the native one has been installed (e.g.:
+    # libc6-amd64:i386 on amd64). Try to detect this by checking that the 
+    # ld.so symlink correctly points to ld-*.so in the slib directory, and 
+    # disabling ldconfig if it is not the case and the new version hasn't
+    # been unpacked yet. The symlink will be fixed when unpacking the new 
+    # libc version and ldconfig will be re-enabled when a new fixed version
+    # is unpacked.
+    if ! readlink -m RTLD_SO | grep -qE 'SLIBDIR/ld-[0-9.]+\.so' ; then
+        # The unpack order is not guaranteed, only disable ldconfig if 
+        # a "broken" version is installed.
+        libc_bin_version=$(dpkg-query -W -f='${Version}' libc-bin)
+        if dpkg --compare-versions "$libc_bin_version" lt "2.18-2"; then
+            echo "Warning: found a potentially broken dynamic loader symlink,"
+            echo "disabling ldconfig to avoid a possible system breakage. It"
+            echo "will be reenabled when a new version of libc-bin is unpacked." 
+            ln -sf /bin/true /sbin/ldconfig
+        fi
+    fi
+
     if [ -n "$preversion" ]; then
 	# NSS authentication trouble guard
 	if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
@@ -215,149 +386,11 @@
 	fi # end upgrading and $preversion lt GLIBC_VERSION
     fi # Upgrading
 
-    # Try to detect copies of the libc library in the various places
-    # the dynamic linker uses.
-    ldfile=$(readlink -m RTLD_SO)
-    if test -f "$file"; then
-        ldbytes=$(head -c 20 RTLD_SO | od -c)
-    else
-        # If the symlink to the dynamic linker is dangling or missing, set
-        # ldbytes to an empty string, the test below will fail and all the
-        # libraries found will be ignored.
-        ldbytes=""
-    fi
-    libcfiles=$(dpkg-query -L $(package_name) 2>/dev/null)
-
-    dirs="SLIBDIR /lib /lib/tls /lib32 /lib64 /usr/local/lib /usr/local/lib32 /usr/local/lib64"
-    for dir in $dirs ; do
-        check_dir "in an unexpected directory" $dir
-    done
-
-    if test -n "$LD_LIBRARY_PATH"; then
-        dirs=$(echo $LD_LIBRARY_PATH | sed 's/:/ /g')
-        for dir in $dirs ; do
-            check_dir "via LD_LIBRARY_PATH" $dir
-        done
-    fi
-
-    if test -e /etc/ld.so.conf; then
-        dirs=$(echo $(cat /etc/ld.so.conf))
-        if test -n "$dirs" ; then
-            for dir in $dirs ; do
-                check_dir "via /etc/ld.so.conf" $dir
-            done
-        fi
-    fi
-
-    if [ -e /lib/tls/i686/cmov/libc.so.6 ] || [ -e /lib/i686/cmov/libc.so.6 ] ; then
-        status_i686=$(dpkg -s libc6-i686 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
-        status_xen=$(dpkg -s libc6-xen 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
-        if ([ -z "$status_i686" ] || [ "$status_i686" = "not-installed" ] || [ "$status_i686" = "config-files" ]) && \
-             ([ -z "$status_xen" ] || [ "$status_xen" = "not-installed" ] || [ "$status_xen" = "config-files" ]); then
-            echo
-            echo "A non-dpkg owned copy of the libc6-i686 package was found."
-            echo "It is not safe to upgrade the C library in this situation;"
-            echo "please remove that copy of the C library and try again."
-            echo
-            exit 1
-        fi
-    fi
-
-    # ldconfig might have broken the ld.so symlink in case a biarch package
-    # of the same architecture than the native one has been installed (e.g.:
-    # libc6-amd64:i386 on amd64). Try to detect this by checking that the 
-    # ld.so symlink correctly points to ld-*.so in the slib directory, and 
-    # disabling ldconfig if it is not the case and the new version hasn't
-    # been unpacked yet. The symlink will be fixed when unpacking the new 
-    # libc version and ldconfig will be re-enabled when a new fixed version
-    # is unpacked.
-    if ! readlink -m RTLD_SO | grep -qE 'SLIBDIR/ld-[0-9.]+\.so' ; then
-        # The unpack order is not guaranteed, only disable ldconfig if 
-        # a "broken" version is installed.
-        libc_bin_version=$(dpkg-query -W -f='${Version}' libc-bin)
-        if dpkg --compare-versions "$libc_bin_version" lt "2.18-2"; then
-            echo "Warning: found a potentially broken dynamic loader symlink,"
-            echo "disabling ldconfig to avoid a possible system breakage. It"
-            echo "will be reenabled when a new version of libc-bin is unpacked." 
-            ln -sf /bin/true /sbin/ldconfig
-        fi
-    fi
-
     # This will keep us from using hwcap libs (optimized) during an
     # upgrade.
     touch /etc/ld.so.nohwcap
 fi
 
-if [ "$type" != abort-upgrade ]
-then
-    # See if LD_LIBRARY_PATH contains the traditional /lib, but not the
-    # multiarch path
-    dirs=$(echo $LD_LIBRARY_PATH | sed 's/:/ /g')
-    for dir in $dirs ; do
-        dir=$(readlink -e $dir || true)
-        case "$dir" in
-        /lib)
-            seen_traditional=1
-            ;;
-        SLIBDIR)
-            seen_multiarch=1
-            ;;
-        esac
-    done
-    if test -n "$seen_traditional" && test -z "$seen_multiarch" ; then
-        echo
-        echo "LD_LIBRARY_PATH contains the traditional /lib directory,"
-        echo "but not the multiarch directory SLIBDIR."
-        echo "It is not safe to upgrade the C library in this situation;"
-        echo "please remove the /lib/directory from LD_LIBRARY_PATH and" 
-        echo "try again."
-        echo
-        exit 1
-    fi
-
-    # glibc kernel version check
-    system=`uname -s`
-    if [ "$system" = "Linux" ]
-    then
-        # Test to make sure z < 255, in x.y.z-n form of kernel version
-        # Also make sure we don't trip on x.y.zFOO-n form
-        kernel_rev=$(uname -r | sed 's/\([0-9]*\.\)\{1,2\}\([0-9]*\)\(.*\)/\2/')
-        if [ "$kernel_rev" -ge 255 ]
-        then
-            echo "WARNING: Your kernel version indicates a revision number"
-            echo "of 255 or greater.  Glibc has a number of built in"
-            echo "assumptions that this revision number is less than 255."
-            echo "If you\'ve built your own kernel, please make sure that any"
-            echo "custom version numbers are appended to the upstream"
-            echo "kernel number with a dash or some other delimiter."
-            echo
-            exit 1
-        fi
-
-        # sanity checking for the appropriate kernel on each architecture.
-        kernel_ver=`uname -r`
-
-        # The GNU libc requires a >= 3.2 kernel, found in wheezy
-        if linux_compare_versions "$kernel_ver" lt 3.2
-        then
-            echo WARNING: this version of the GNU libc requires kernel version
-            echo 3.2 or later.  Please upgrade your kernel before installing
-            echo glibc.
-            exit 1
-        fi
-
-    elif [ $system = "GNU/kFreeBSD" ] ; then
-        kernel_ver=`uname -r`
-        if kfreebsd_compare_versions "$kernel_ver" lt 8.3
-        then
-            echo WARNING: this version of the GNU libc requires kernel version
-            echo 8.3 or later.  Please upgrade your kernel before installing
-            echo glibc.
-            exit 1
-        fi
-    fi
-fi
-
 # We now use the multiarch triplet instead of the GNU triplet for the ld.so
 # configuration file, in order to keep a stable path. Remove the old file.
 case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
@@ -375,18 +408,6 @@
 
 #DEBHELPER#
 
-case $type in
-    upgrade|abort-upgrade)
-        if test -L /lib64 && dpkg --compare-versions "$2" lt 2.13-17; then
-            case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
-                amd64 | ppc64 | sparc64)
-                    remove_lib64_symlink
-                    ;;
-            esac
-        fi
-        ;;
-esac
-
 if [ -n "$preversion" ]; then
     if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
        # unconditionally wipe ld.so.cache on major version upgrades; this

Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.prerm
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.prerm	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.prerm	2015-12-10 22:28:07 UTC (rev 6795)
@@ -1,70 +0,0 @@
-#!/bin/sh
-set -e
-export LC_ALL=C
-
-type=$1
-if [ "x$2" != "xin-favour" ]; then
-    preversion=$2
-fi
-
-restore_lib64_symlink() {
-# Downgrading from a version with a /lib64 directory to a version with
-# a /lib64 symlink is extremely dangerous.  We need to move the
-# directory aside and restore the symlink, otherwise the dynamic
-# linker gets lost after unpacking the replacing version.
-
-    ldfile=$(readlink -e RTLD_SO)
-    # Test if libc is of the same architecture as coreutils
-    # If not, they almost surely have a multiarch system and we can use
-    # the native ELF interpreter
-    if ! $ldfile /bin/true 2>/dev/null; then
-	interpreter=
-    else
-	interpreter=$ldfile
-    fi
-
-    # Create the symlink in /lib again
-    cp -a RTLD_SO /lib/
-
-    # sync before and after the operation to reduce the danger of hosing
-    # the system
-    sync
-    # See if they have anything in /lib64 besides the ELF interpreter.
-    # If yes, move the directory aside so they can restore it later,
-    # otherwise we just remove it.
-    if ls -1A /lib64 | grep -vq "^$(basename RTLD_SO)$"; then
-	echo "Warning: /lib64 not empty during libc downgrade, renaming it to /lib64.glibc-old"
-	mv /lib64 /lib64.glibc-old
-    else
-	rm -rf /lib64
-    fi
-
-    $interpreter /bin/ln -s /lib /lib64
-    sync
-}
-
-
-#DEBHELPER#
-
-if [ "$type" = upgrade ]; then
-    if dpkg --compare-versions "$preversion" lt 2.13-17; then
-	if ! test -L /lib64; then
-	    case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
-		amd64 | ppc64 | sparc64)
-		    restore_lib64_symlink ;;
-	    esac
-	fi
-    fi
-fi
-
-if [ -n "$preversion" ]; then
-    if dpkg --compare-versions "$preversion" lt 2.13-5; then
-        # downgrading from a multiarch libc to a pre-multiarch libc; we have
-        # to blow away /etc/ld.so.cache, otherwise the old unpacked libc
-        # is still first in the cache and segfaults when combined with
-        # our newly-unpacked ld.so. 
-        rm -f /etc/ld.so.cache
-    fi
-fi
-
-exit 0

Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.templates
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.templates	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.templates	2015-12-10 22:28:07 UTC (rev 6795)
@@ -60,3 +60,15 @@
  instead, all necessary restarts will be done for you automatically so you
  can avoid being asked questions on each library upgrade.
 
+Template: glibc/kernel-too-old
+Type: error
+_Description: Kernel must be upgraded
+ This version of the GNU libc requires kernel version ${kernel_ver} or
+ later.  Please upgrade your kernel before installing glibc.
+
+Template: glibc/kernel-not-supported
+Type: note
+_Description: Kernel version not supported
+ This version of the GNU libc requires kernel version ${kernel_ver} or
+ later.  Older versions might work but are not officially supported. 
+ Please consider upgrading your kernel.

Added: glibc-package/branches/glibc-2.22/debian/patches/any/cvs-grantpt-pty-owner.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/cvs-grantpt-pty-owner.diff	                        (rev 0)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/cvs-grantpt-pty-owner.diff	2015-12-10 22:28:07 UTC (rev 6795)
@@ -0,0 +1,46 @@
+2015-12-10  Aurelien Jarno  <aurelien@aurel32.net>
+	    Jakub Wilk  <jwilk@debian.org>
+
+	[BZ #19347]
+	* sysdeps/unix/grantpt.c [!HAVE_PT_CHOWN] (grantpt): Do not try
+	to change the group of the device to the tty group.
+
+--- a/sysdeps/unix/grantpt.c
++++ b/sysdeps/unix/grantpt.c
+@@ -155,6 +155,7 @@ grantpt (int fd)
+     }
+   gid_t gid = tty_gid == -1 ? __getgid () : tty_gid;
+ 
++#if HAVE_PT_CHOWN
+   /* Make sure the group of the device is that special group.  */
+   if (st.st_gid != gid)
+     {
+@@ -164,9 +165,26 @@ grantpt (int fd)
+ 
+   /* Make sure the permission mode is set to readable and writable by
+      the owner, and writable by the group.  */
+-  if ((st.st_mode & ACCESSPERMS) != (S_IRUSR|S_IWUSR|S_IWGRP))
++  mode_t mode = S_IRUSR|S_IWUSR|S_IWGRP;
++#else
++  /* When built without pt_chown, we have delegated the creation of the
++     pty node with the right group and permission mode to the kernel, and
++     non-root users are unlikely to be able to change it. Therefore let's
++     consider that POSIX enforcement is the responsibility of the whole
++     system and not only the GNU libc. Thus accept different group or
++     permission mode.  */
++
++  /* Make sure the permission is set to readable and writable by the
++     owner.  For security reasons, make it writable by the group only
++     when originally writable and when the group of the device is that
++     special group.  */
++  mode_t mode = S_IRUSR|S_IWUSR|
++	        ((st.st_gid == gid) ? (st.st_mode & S_IWGRP) : 0);
++#endif
++
++  if ((st.st_mode & ACCESSPERMS) != mode)
+     {
+-      if (__chmod (buf, S_IRUSR|S_IWUSR|S_IWGRP) < 0)
++      if (__chmod (buf, mode) < 0)
+ 	goto helper;
+     }
+ 

Added: glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-libpthread-api.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-libpthread-api.diff	                        (rev 0)
+++ glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-libpthread-api.diff	2015-12-10 22:28:07 UTC (rev 6795)
@@ -0,0 +1,834 @@
+commit 577a738522d34a64cb3cd5bb8368c8b1a344f38e
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sun Dec 6 01:22:01 2015 +0100
+
+    Add __THROW and __nonnull attributes
+    
+    * include/pthread/pthread.h: Add __THROW and __nonnull attributes to
+    functions.
+
+commit 86c3dbc6445ff1bbd72c43ce46dd9f84d80e890e
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sat Oct 31 11:20:52 2015 +0100
+
+    Do not use __thread as parameter name
+    
+    That is the TLS qualifier.
+    
+    * include/pthread/pthread.h (pthread_getattr_np, pthread_cancel,
+    pthread_kill, pthread_getcpuclockid, pthread_getschedparam,
+    pthread_setschedparam, pthread_setschedprio): Use __thr as parameter name
+    instead of __thread.
+
+commit 46211ef0b82e6db1d62021fadfdd2be8cf78e729
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Tue Sep 22 02:54:11 2015 +0200
+
+    Avoid exposing function prototype parameter names
+    
+        * include/pthread/pthread.h (pthread_mutex_setprioceiling): Prepend '__'
+        to prio parameter name.
+
+commit 02ca56841e7fc3d016b948b29421619408a18227
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Tue Sep 22 02:52:13 2015 +0200
+
+    Do not expose "noreturn" name
+    
+    * ./include/pthread/pthread.h (pthread_exit): Use __noreturn__ attribute
+    instead of noreturn.
+
+commit 40f99833334b930762f957763d9db06e2f5dc7bb
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Mon Sep 21 00:04:15 2015 +0200
+
+    Avoid exposing function prototype parameter names
+    
+    * include/pthread/pthread.h: Prepend '__' to parameter names.
+    * sysdeps/mach/hurd/bits/pthread-np.h: Likewise.
+
+--- a/libpthread/include/pthread/pthread.h
++++ b/libpthread/include/pthread/pthread.h
+@@ -79,112 +79,132 @@ __BEGIN_DECLS
+ 
+ /* Initialize the thread attribute object in *ATTR to the default
+    values.  */
+-extern int pthread_attr_init (pthread_attr_t *attr);
++extern int pthread_attr_init (pthread_attr_t *__attr) __THROW __nonnull ((1));
+ 
+ /* Destroy the thread attribute object in *ATTR.  */
+-extern int pthread_attr_destroy (pthread_attr_t *attr);
++extern int pthread_attr_destroy (pthread_attr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the inheritsched attribute in *ATTR in
+    *INHERITSCHED.  */
+-extern int pthread_attr_getinheritsched (const pthread_attr_t *__restrict attr,
+-					 int *__restrict inheritsched);
++extern int pthread_attr_getinheritsched (const pthread_attr_t *__restrict __attr,
++					 int *__restrict __inheritsched)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the inheritsched attribute in *ATTR to
+    INHERITSCHED.  */
+-extern int pthread_attr_setinheritsched (pthread_attr_t *attr,
+-					 int inheritsched);
++extern int pthread_attr_setinheritsched (pthread_attr_t *__attr,
++					 int __inheritsched)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the schedparam attribute in *ATTR in *PARAM.  */
+-extern int pthread_attr_getschedparam (const pthread_attr_t *__restrict attr,
+-				       struct sched_param *__restrict param);
++extern int pthread_attr_getschedparam (const pthread_attr_t *__restrict __attr,
++				       struct sched_param *__restrict __param)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the schedparam attribute in *ATTR to PARAM.  */
+-extern int pthread_attr_setschedparam (pthread_attr_t *__restrict attr,
+-				       const struct sched_param *__restrict param);
++extern int pthread_attr_setschedparam (pthread_attr_t *__restrict __attr,
++				       const struct sched_param *__restrict
++				       __param) __THROW __nonnull ((1, 2));
+ 
+ 
+ /* Return the value of the schedpolicy attribute in *ATTR to *POLICY.  */
+-extern int pthread_attr_getschedpolicy (const pthread_attr_t *__restrict attr,
+-					int *__restrict policy);
++extern int pthread_attr_getschedpolicy (const pthread_attr_t *__restrict __attr,
++					int *__restrict __policy)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the schedpolicy attribute in *ATTR to POLICY.  */
+-extern int pthread_attr_setschedpolicy (pthread_attr_t *attr,
+-					int policy);
++extern int pthread_attr_setschedpolicy (pthread_attr_t *__attr,
++					int __policy)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the contentionscope attribute in *ATTR in
+    *CONTENTIONSCOPE.  */
+-extern int pthread_attr_getscope (const pthread_attr_t *__restrict attr,
+-				  int *__restrict contentionscope);
++extern int pthread_attr_getscope (const pthread_attr_t *__restrict __attr,
++				  int *__restrict __contentionscope)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the contentionscope attribute in *ATTR to
+    CONTENTIONSCOPE.  */
+-extern int pthread_attr_setscope (pthread_attr_t *attr,
+-				  int contentionscope);
++extern int pthread_attr_setscope (pthread_attr_t *__attr,
++				  int __contentionscope)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the stackaddr attribute in *ATTR in
+    *STACKADDR.  */
+-extern int pthread_attr_getstackaddr (const pthread_attr_t *__restrict attr,
+-				      void **__restrict stackaddr);
++extern int pthread_attr_getstackaddr (const pthread_attr_t *__restrict __attr,
++				      void **__restrict __stackaddr)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the stackaddr attribute in *ATTR to STACKADDR.  */
+-extern int pthread_attr_setstackaddr (pthread_attr_t *attr,
+-				      void *stackaddr);
++extern int pthread_attr_setstackaddr (pthread_attr_t *__attr,
++				      void *__stackaddr)
++	__THROW __nonnull ((1));
+ 
+ 
+ #ifdef __USE_XOPEN2K
+ /* Return the value of the stackaddr and stacksize attributes in *ATTR
+    in *STACKADDR and *STACKSIZE respectively.  */
+-extern int pthread_attr_getstack (const pthread_attr_t *__restrict attr,
+-				  void **__restrict stackaddr,
+-				  size_t *__restrict stacksize);
++extern int pthread_attr_getstack (const pthread_attr_t *__restrict __attr,
++				  void **__restrict __stackaddr,
++				  size_t *__restrict __stacksize)
++	__THROW __nonnull ((1, 2, 3));
+ 
+ /* Set the value of the stackaddr and stacksize attributes in *ATTR to
+    STACKADDR and STACKSIZE respectively.  */
+-extern int pthread_attr_setstack (pthread_attr_t *attr,
+-				  void *stackaddr,
+-				  size_t stacksize);
++extern int pthread_attr_setstack (pthread_attr_t *__attr,
++				  void *__stackaddr,
++				  size_t __stacksize)
++	__THROW __nonnull ((1));
+ #endif
+ 
+ 
+ /* Return the value of the detachstate attribute in *ATTR in
+    *DETACHSTATE.  */
+-extern int pthread_attr_getdetachstate (const pthread_attr_t *attr,
+-					int *detachstate);
++extern int pthread_attr_getdetachstate (const pthread_attr_t *__attr,
++					int *__detachstate)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the detachstate attribute in *ATTR to
+    DETACHSTATE.  */
+-extern int pthread_attr_setdetachstate (pthread_attr_t *attr,
+-					int detachstate);
++extern int pthread_attr_setdetachstate (pthread_attr_t *__attr,
++					int __detachstate)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the guardsize attribute in *ATTR in
+    *GUARDSIZE.  */
+-extern int pthread_attr_getguardsize (const pthread_attr_t *__restrict attr,
+-				      size_t *__restrict guardsize);
++extern int pthread_attr_getguardsize (const pthread_attr_t *__restrict __attr,
++				      size_t *__restrict __guardsize)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the guardsize attribute in *ATTR to GUARDSIZE.  */
+-extern int pthread_attr_setguardsize (pthread_attr_t *attr,
+-				      size_t guardsize);
++extern int pthread_attr_setguardsize (pthread_attr_t *__attr,
++				      size_t __guardsize)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the stacksize attribute in *ATTR in
+    *STACKSIZE.  */
+-extern int pthread_attr_getstacksize (const pthread_attr_t *__restrict attr,
+-				      size_t *__restrict stacksize);
++extern int pthread_attr_getstacksize (const pthread_attr_t *__restrict __attr,
++				      size_t *__restrict __stacksize)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the stacksize attribute in *ATTR to STACKSIZE.  */
+-extern int pthread_attr_setstacksize (pthread_attr_t *attr,
+-				      size_t stacksize);
++extern int pthread_attr_setstacksize (pthread_attr_t *__attr,
++				      size_t __stacksize)
++	__THROW __nonnull ((1));
+ 
+ #ifdef __USE_GNU
+ /* Initialize thread attribute *ATTR with attributes corresponding to the
+    already running thread THREAD.  It shall be called on an uninitialized ATTR
+    and destroyed with pthread_attr_destroy when no longer needed.  */
+-extern int pthread_getattr_np (pthread_t thread, pthread_attr_t *attr);
++extern int pthread_getattr_np (pthread_t __thr, pthread_attr_t *__attr)
++	__THROW __nonnull ((2));
+ #endif
+ 
+ 
+@@ -193,11 +213,11 @@ extern int pthread_getattr_np (pthread_t
+ extern int pthread_create (pthread_t *__restrict __threadp,
+ 			   __const pthread_attr_t *__restrict __attr,
+ 			   void *(*__start_routine)(void *),
+-			   void *__restrict __arg);
++			   void *__restrict __arg) __THROWNL __nonnull ((1, 3));
+ 
+ /* Terminate the current thread and make STATUS available to any
+    thread that might join us.  */
+-extern void pthread_exit (void *__status) __attribute__ ((noreturn));
++extern void pthread_exit (void *__status) __attribute__ ((__noreturn__));
+ 
+ /* Make calling thread wait for termination of thread THREAD.  Return
+    the exit status of the thread in *STATUS.  */
+@@ -209,7 +229,7 @@ extern int pthread_detach (pthread_t __t
+ 
+ /* Compare thread IDs T1 and T2.  Return nonzero if they are equal, 0
+    if they are not.  */
+-extern int pthread_equal (pthread_t __t1, pthread_t __t2);
++extern int pthread_equal (pthread_t __t1, pthread_t __t2) __THROW;
+ 
+ # ifdef __USE_EXTERN_INLINES
+ 
+@@ -223,7 +243,7 @@ pthread_equal (pthread_t __t1, pthread_t
+ 
+ 
+ /* Return the thread ID of the calling thread.  */
+-extern pthread_t pthread_self (void);
++extern pthread_t pthread_self (void) __THROW;
+ 
+ 
+ /* Mutex attributes.  */
+@@ -255,54 +275,64 @@ extern pthread_t pthread_self (void);
+ 
+ /* Initialize the mutex attribute object in *ATTR to the default
+    values.  */
+-extern int pthread_mutexattr_init(pthread_mutexattr_t *attr);
++extern int pthread_mutexattr_init(pthread_mutexattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy the mutex attribute structure in *ATTR.  */
+-extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr);
++extern int pthread_mutexattr_destroy(pthread_mutexattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ 
+ #ifdef __USE_UNIX98
+ /* Return the value of the prioceiling attribute in *ATTR in
+    *PRIOCEILING.  */
+-extern int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict attr,
+-					    int *__restrict prioceiling);
++extern int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict __attr,
++					    int *__restrict __prioceiling)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the prioceiling attribute in *ATTR to
+    PRIOCEILING.  */
+-extern int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr,
+-					    int prioceiling);
++extern int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *__attr,
++					    int __prioceiling)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the protocol attribute in *ATTR in
+    *PROTOCOL.  */
+-extern int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict attr,
+-					 int *__restrict protocol);
++extern int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr,
++					 int *__restrict __protocol)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the protocol attribute in *ATTR to PROTOCOL.  */
+-extern int pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr,
+-					 int protocol);
++extern int pthread_mutexattr_setprotocol(pthread_mutexattr_t *__attr,
++					 int __protocol)
++	__THROW __nonnull ((1));
+ #endif
+ 
+ 
+ /* Return the value of the process shared attribute in *ATTR in
+    *PSHARED.  */
+-extern int pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict attr,
+-					int *__restrict pshared);
++extern int pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict __attr,
++					int *__restrict __pshared)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the process shared attribute in *ATTR to
+    PSHARED.  */
+-extern int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr,
+-					int pshared);
++extern int pthread_mutexattr_setpshared(pthread_mutexattr_t *__attr,
++					int __pshared)
++	__THROW __nonnull ((1));
+ 
+ 
+ #if defined __USE_UNIX98 || defined __USE_XOPEN2K8
+ /* Return the value of the type attribute in *ATTR in *TYPE.  */
+-extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict attr,
+-				     int *__restrict type);
++extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict __attr,
++				     int *__restrict __type)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the type attribute in *ATTR to TYPE.  */
+-extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr,
+-				     int type);
++extern int pthread_mutexattr_settype(pthread_mutexattr_t *__attr,
++				     int __type)
++	__THROW __nonnull ((1));
+ #endif
+ 
+ 
+@@ -323,42 +353,50 @@ extern int pthread_mutexattr_settype(pth
+ /* Create a mutex with attributes given by ATTR and store it in
+    *__MUTEX.  */
+ extern int pthread_mutex_init (struct __pthread_mutex *__restrict __mutex,
+-			       const pthread_mutexattr_t *__restrict attr);
++			       const pthread_mutexattr_t *__restrict __attr)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy the mutex __MUTEX.  */
+-extern int pthread_mutex_destroy (struct __pthread_mutex *__mutex);
++extern int pthread_mutex_destroy (struct __pthread_mutex *__mutex)
++	__THROW __nonnull ((1));
+ 
+ /* Wait until lock for MUTEX becomes available and lock it.  */
+ extern int pthread_mutex_lock (pthread_mutex_t *__mutex);
+ 
+ /* Try to lock MUTEX.  */
+-extern int pthread_mutex_trylock (pthread_mutex_t *__mutex);
++extern int pthread_mutex_trylock (pthread_mutex_t *__mutex)
++	__THROWNL __nonnull ((1));
+ 
+ #ifdef __USE_XOPEN2K
+ /* Try to lock MUTEX, block until *ABSTIME if it is already held.  */
+-extern int pthread_mutex_timedlock (struct __pthread_mutex *__restrict mutex,
+-				    const struct timespec *__restrict abstime);
++extern int pthread_mutex_timedlock (struct __pthread_mutex *__restrict __mutex,
++				    const struct timespec *__restrict __abstime)
++	__THROWNL __nonnull ((1, 2));
+ #endif
+ 
+ /* Unlock MUTEX.  */
+-extern int pthread_mutex_unlock (pthread_mutex_t *__mutex);
++extern int pthread_mutex_unlock (pthread_mutex_t *__mutex)
++	__THROWNL __nonnull ((1));
+ 
+ /* Transfer ownership of the mutex MUTEX to the thread TID.  The
+    caller must own the lock.  */
+-extern int __pthread_mutex_transfer_np (struct __pthread_mutex *mutex,
+-					pthread_t tid);
++extern int __pthread_mutex_transfer_np (struct __pthread_mutex *__mutex,
++					pthread_t __tid)
++	__THROWNL __nonnull ((1));
+ 
+ 
+ #ifdef __USE_UNIX98
+ /* Return the priority ceiling of mutex *MUTEX in *PRIOCEILING.  */
+-extern int pthread_mutex_getprioceiling (const pthread_mutex_t *__restrict mutex,
+-					 int *__restrict prioceiling);
++extern int pthread_mutex_getprioceiling (const pthread_mutex_t *__restrict __mutex,
++					 int *__restrict __prioceiling)
++	__THROW __nonnull ((1, 2));
+ 
+ /* After acquiring the mutex *MUTEX, set its priority ceiling to PRIO
+    and return the old priority ceiling in *OLDPRIO.  Before returning,
+    release the mutex.  */
+-extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict mutex,
+-					 int prio, int *__restrict oldprio);
++extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict __mutex,
++					 int __prio, int *__restrict __oldprio)
++	__THROW __nonnull ((1, 3));
+ #endif
+ 
+ 
+@@ -369,32 +407,38 @@ extern int pthread_mutex_setprioceiling
+ 
+ /* Initialize the condition attribute in *ATTR to the default
+    values.  */
+-extern int pthread_condattr_init (pthread_condattr_t *attr);
++extern int pthread_condattr_init (pthread_condattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy the condition attribute structure in *ATTR.  */
+-extern int pthread_condattr_destroy (pthread_condattr_t *attr);
++extern int pthread_condattr_destroy (pthread_condattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ 
+ #ifdef __USE_XOPEN2K
+ /* Return the value of the clock attribute in *ATTR in *CLOCK_ID.  */
+-extern int pthread_condattr_getclock (const pthread_condattr_t *__restrict attr,
+-				      __clockid_t *__restrict clock_id);
++extern int pthread_condattr_getclock (const pthread_condattr_t *__restrict __attr,
++				      __clockid_t *__restrict __clock_id)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the clock attribute in *ATTR to CLOCK_ID.  */
+-extern int pthread_condattr_setclock (pthread_condattr_t *attr,
+-				      __clockid_t clock_id);
++extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
++				      __clockid_t __clock_id)
++	__THROW __nonnull ((1));
+ #endif
+ 
+ 
+ /* Return the value of the process shared attribute in *ATTR in
+    *PSHARED.  */
+-extern int pthread_condattr_getpshared (const pthread_condattr_t *__restrict attr,
+-					int *__restrict pshared);
++extern int pthread_condattr_getpshared (const pthread_condattr_t *__restrict __attr,
++					int *__restrict __pshared)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the process shared attribute in *ATTR to
+    PSHARED.  */
+-extern int pthread_condattr_setpshared (pthread_condattr_t *attr,
+-					int pshared);
++extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
++					int __pshared)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Condition variables.  */
+@@ -403,23 +447,28 @@ extern int pthread_condattr_setpshared (
+ 
+ #define PTHREAD_COND_INITIALIZER __PTHREAD_COND_INITIALIZER
+ 
+-extern int pthread_cond_init (pthread_cond_t *__restrict cond,
+-			      const pthread_condattr_t *__restrict attr);
++extern int pthread_cond_init (pthread_cond_t *__restrict __cond,
++			      const pthread_condattr_t *__restrict __attr)
++	__THROW __nonnull ((1));
+ 
+-extern int pthread_cond_destroy (pthread_cond_t *cond);
++extern int pthread_cond_destroy (pthread_cond_t *__cond)
++	__THROW __nonnull ((1));
+ 
+ /* Unblock at least one of the threads that are blocked on condition
+    variable COND.  */
+-extern int pthread_cond_signal (pthread_cond_t *__cond);
++extern int pthread_cond_signal (pthread_cond_t *__cond)
++	__THROWNL __nonnull ((1));
+ 
+ /* Unblock all threads that are blocked on condition variable COND.  */
+-extern int pthread_cond_broadcast (pthread_cond_t *__cond);
++extern int pthread_cond_broadcast (pthread_cond_t *__cond)
++	__THROWNL __nonnull ((1));
+ 
+ /* Block on condition variable COND.  MUTEX should be held by the
+    calling thread.  On success, MUTEX will be held by the calling
+    thread.  */
+ extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
+-			      pthread_mutex_t *__restrict __mutex);
++			      pthread_mutex_t *__restrict __mutex)
++	 __nonnull ((1, 2));
+ 
+ /* Block on condition variable COND.  MUTEX should be held by the
+    calling thread. On success, MUTEX will be held by the calling
+@@ -427,7 +476,8 @@ extern int pthread_cond_wait (pthread_co
+    returned, and MUTEX will nevertheless be held.  */
+ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
+ 				   pthread_mutex_t *__restrict __mutex,
+-				   __const struct timespec *__restrict __abstime);
++				   __const struct timespec *__restrict __abstime)
++	 __nonnull ((1, 2, 3));
+ 
+ 
+ /* Spin locks.  */
+@@ -439,22 +489,27 @@ extern int pthread_cond_timedwait (pthre
+ #define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER
+ 
+ /* Destroy the spin lock object LOCK.  */
+-extern int pthread_spin_destroy (pthread_spinlock_t *__lock);
++extern int pthread_spin_destroy (pthread_spinlock_t *__lock)
++	__THROW __nonnull ((1));
+ 
+ /* Initialize the spin lock object LOCK.  PSHARED determines whether
+    the spin lock can be operated upon by multiple processes.  */
+-extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared);
++extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
++	__THROW __nonnull ((1));
+ 
+ /* Lock the spin lock object LOCK.  If the lock is held by another
+    thread spin until it becomes available.  */
+-extern int pthread_spin_lock (pthread_spinlock_t *__lock);
++extern int pthread_spin_lock (pthread_spinlock_t *__lock)
++	__THROWNL __nonnull ((1));
+ 
+ /* Lock the spin lock object LOCK.  Fail if the lock is held by
+    another thread.  */
+-extern int pthread_spin_trylock (pthread_spinlock_t *__lock);
++extern int pthread_spin_trylock (pthread_spinlock_t *__lock)
++	__THROWNL __nonnull ((1));
+ 
+ /* Unlock the spin lock object LOCK.  */
+-extern int pthread_spin_unlock (pthread_spinlock_t *__lock);
++extern int pthread_spin_unlock (pthread_spinlock_t *__lock)
++	__THROWNL __nonnull ((1));
+ 
+ # ifdef __USE_EXTERN_INLINES
+ 
+@@ -503,21 +558,25 @@ pthread_spin_unlock (pthread_spinlock_t
+ 
+ /* Initialize rwlock attribute object in *ATTR to the default
+    values.  */
+-extern int pthread_rwlockattr_init (pthread_rwlockattr_t *attr);
++extern int pthread_rwlockattr_init (pthread_rwlockattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy the rwlock attribute object in *ATTR.  */
+-extern int pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr);
++extern int pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the process shared attribute in *ATTR in
+    *PSHARED.  */
+-extern int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__restrict attr,
+-					  int *__restrict pshared);
++extern int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__restrict __attr,
++					  int *__restrict __pshared)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the process shared atrribute in *ATTR to
+    PSHARED.  */
+-extern int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr,
+-					  int pshared);
++extern int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
++					  int __pshared)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* rwlocks.  */
+@@ -527,40 +586,49 @@ extern int pthread_rwlockattr_setpshared
+ #define PTHREAD_RWLOCK_INITIALIZER __PTHREAD_RWLOCK_INITIALIZER
+ /* Create a rwlock object with attributes given by ATTR and strore the
+    result in *RWLOCK.  */
+-extern int pthread_rwlock_init (pthread_rwlock_t *__restrict rwlock,
+-				const pthread_rwlockattr_t *__restrict attr);
++extern int pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock,
++				const pthread_rwlockattr_t *__restrict __attr)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy the rwlock *RWLOCK.  */
+-extern int pthread_rwlock_destroy (pthread_rwlock_t *rwlock);
++extern int pthread_rwlock_destroy (pthread_rwlock_t *__rwlock)
++	__THROW __nonnull ((1));
+ 
+ /* Acquire the rwlock *RWLOCK for reading.  */
+-extern int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock);
++extern int pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock)
++	__THROWNL __nonnull ((1));
+ 
+ /* Acquire the rwlock *RWLOCK for reading.  */
+-extern int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock);
++extern int pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock)
++	__THROWNL __nonnull ((1));
+ 
+ # ifdef __USE_XOPEN2K
+ /* Acquire the rwlock *RWLOCK for reading blocking until *ABSTIME if
+    it is already held.  */
+-extern int pthread_rwlock_timedrdlock (struct __pthread_rwlock *__restrict rwlock,
+-				       const struct timespec *__restrict abstime);
++extern int pthread_rwlock_timedrdlock (struct __pthread_rwlock *__restrict __rwlock,
++				       const struct timespec *__restrict __abstime)
++	__THROWNL __nonnull ((1, 2));
+ # endif
+ 
+ /* Acquire the rwlock *RWLOCK for writing.  */
+-extern int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock);
++extern int pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock)
++	__THROWNL __nonnull ((1));
+ 
+ /* Try to acquire the rwlock *RWLOCK for writing.  */
+-extern int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock);
++extern int pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock)
++	__THROWNL __nonnull ((1));
+ 
+ # ifdef __USE_XOPEN2K
+ /* Acquire the rwlock *RWLOCK for writing blocking until *ABSTIME if
+    it is already held.  */
+-extern int pthread_rwlock_timedwrlock (struct __pthread_rwlock *__restrict rwlock,
+-				       const struct timespec *__restrict abstime);
++extern int pthread_rwlock_timedwrlock (struct __pthread_rwlock *__restrict __rwlock,
++				       const struct timespec *__restrict __abstime)
++	__THROWNL __nonnull ((1, 2));
+ # endif
+ 
+ /* Release the lock held by the current thread on *RWLOCK.  */
+-extern int pthread_rwlock_unlock (pthread_rwlock_t *rwlock);
++extern int pthread_rwlock_unlock (pthread_rwlock_t *__rwlock)
++	__THROWNL __nonnull ((1));
+ 
+ #endif /* __USE_UNIX98 || __USE_XOPEN2K */
+ 
+@@ -569,10 +637,10 @@ extern int pthread_rwlock_unlock (pthrea
+ /* Cancelation.  */
+ 
+ /* Register a cleanup handler.  */
+-extern void pthread_cleanup_push (void (*routine) (void *), void *arg);
++extern void pthread_cleanup_push (void (*__routine) (void *), void *__arg);
+ 
+ /* Unregister a cleanup handler.  */
+-extern void pthread_cleanup_pop (int execute);
++extern void pthread_cleanup_pop (int __execute);
+ 
+ #include <bits/cancelation.h>
+ 
+@@ -584,21 +652,21 @@ extern void pthread_cleanup_pop (int exe
+ 
+ /* Return the calling thread's cancelation state in *OLDSTATE and set
+    its state to STATE.  */
+-extern int pthread_setcancelstate (int state, int *oldstate);
++extern int pthread_setcancelstate (int __state, int *__oldstate);
+ 
+ #define PTHREAD_CANCEL_DEFERRED 0
+ #define PTHREAD_CANCEL_ASYNCHRONOUS 1
+ 
+ /* Return the calling thread's cancelation type in *OLDTYPE and set
+    its type to TYPE.  */
+-extern int pthread_setcanceltype (int type, int *oldtype);
++extern int pthread_setcanceltype (int __type, int *__oldtype);
+ 
+ /* Value returned by pthread_join if the target thread was
+    canceled.  */
+ #define PTHREAD_CANCELED ((void *) -1)
+ 
+ /* Cancel THEAD.  */
+-extern int pthread_cancel (pthread_t thread);
++extern int pthread_cancel (pthread_t __thr);
+ 
+ /* Add an explicit cancelation point.  */
+ extern void pthread_testcancel (void);
+@@ -612,21 +680,25 @@ extern void pthread_testcancel (void);
+ 
+ /* Initialize barrier attribute object in *ATTR to the default
+    values.  */
+-extern int pthread_barrierattr_init (pthread_barrierattr_t *attr);
++extern int pthread_barrierattr_init (pthread_barrierattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy the barrier attribute object in *ATTR.  */
+-extern int pthread_barrierattr_destroy (pthread_barrierattr_t *attr);
++extern int pthread_barrierattr_destroy (pthread_barrierattr_t *__attr)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Return the value of the process shared attribute in *ATTR in
+    *PSHARED.  */
+-extern int pthread_barrierattr_getpshared (const pthread_barrierattr_t *__restrict attr,
+-					   int *__restrict pshared);
++extern int pthread_barrierattr_getpshared (const pthread_barrierattr_t *__restrict __attr,
++					   int *__restrict __pshared)
++	__THROW __nonnull ((1, 2));
+ 
+ /* Set the value of the process shared atrribute in *ATTR to
+    PSHARED.  */
+-extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *attr,
+-					   int pshared);
++extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
++					   int __pshared)
++	__THROW __nonnull ((1));
+ 
+ 
+ /* Barriers.  */
+@@ -638,15 +710,18 @@ extern int pthread_barrierattr_setpshare
+ #define PTHREAD_BARRIER_SERIAL_THREAD -1
+ 
+ /* Initialize barrier BARRIER.  */
+-extern int pthread_barrier_init (pthread_barrier_t *__restrict barrier,
+-				const pthread_barrierattr_t *__restrict attr,
+-				unsigned count);
++extern int pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
++				const pthread_barrierattr_t *__restrict __attr,
++				unsigned __count)
++	__THROW __nonnull ((1));
+ 
+ /* Destroy barrier BARRIER.  */
+-extern int pthread_barrier_destroy (pthread_barrier_t *barrier);
++extern int pthread_barrier_destroy (pthread_barrier_t *__barrier)
++	__THROW __nonnull ((1));
+ 
+ /* Wait on barrier BARRIER.  */
+-extern int pthread_barrier_wait (pthread_barrier_t *barrier);
++extern int pthread_barrier_wait (pthread_barrier_t *__barrier)
++	__THROWNL __nonnull ((1));
+ 
+ #endif /* __USE_XOPEN2K */
+ 
+@@ -659,18 +734,20 @@ extern int pthread_barrier_wait (pthread
+ /* Create a thread specific data key in KEY visible to all threads.
+    On thread destruction, DESTRUCTOR shall be called with the thread
+    specific data associate with KEY if it is not NULL.  */
+-extern int pthread_key_create (pthread_key_t *key,
+-			       void (*destructor) (void *));
++extern int pthread_key_create (pthread_key_t *__key,
++			       void (*__destructor) (void *))
++	__THROW __nonnull ((1));
+ 
+ /* Delete the thread specific data key KEY.  The associated destructor
+    function is not called.  */
+-extern int pthread_key_delete (pthread_key_t key);
++extern int pthread_key_delete (pthread_key_t __key) __THROW;
+ 
+ /* Return the caller thread's thread specific value of KEY.  */
+-extern void *pthread_getspecific (pthread_key_t key);
++extern void *pthread_getspecific (pthread_key_t __key) __THROW;
+ 
+ /* Set the caller thread's thread specific value of KEY to VALUE.  */
+-extern int pthread_setspecific (pthread_key_t key, const void *value);
++extern int pthread_setspecific (pthread_key_t __key, const void *__value)
++	__THROW;
+ 
+ 
+ /* Dynamic package initialization.  */
+@@ -681,18 +758,18 @@ extern int pthread_setspecific (pthread_
+ 
+ /* Call INIT_ROUTINE if this function has never been called with
+    *ONCE_CONTROL, otherwise do nothing.  */
+-extern int pthread_once (pthread_once_t *once_control,
+-			 void (*init_routine) (void));
++extern int pthread_once (pthread_once_t *__once_control,
++			 void (*__init_routine) (void)) __nonnull ((1, 2));
+ 
+ 
+ /* Concurrency.  */
+ 
+ #ifdef __USE_UNIX98
+ /* Set the desired concurrency level to NEW_LEVEL.  */
+-extern int pthread_setconcurrency (int new_level);
++extern int pthread_setconcurrency (int __new_level) __THROW;
+ 
+ /* Get the current concurrency level.  */
+-extern int pthread_getconcurrency (void);
++extern int pthread_getconcurrency (void) __THROW;
+ #endif
+ 
+ 
+@@ -705,43 +782,46 @@ extern int pthread_getconcurrency (void)
+    NULL.  The prepare handles will be called in the reverse order
+    which they were registered and the parent and child handlers in the
+    order in which they were registered.  */
+-extern int pthread_atfork (void (*prepare) (void), void (*parent) (void),
+-			   void (*child) (void));
++extern int pthread_atfork (void (*__prepare) (void), void (*__parent) (void),
++			   void (*__child) (void)) __THROW;
+ 
+ 
+ /* Signals (should be in <signal.h>).  */
+ 
+ /* Send signal SIGNO to thread THREAD.  */
+-extern int pthread_kill (pthread_t thread, int signo);
++extern int pthread_kill (pthread_t __thr, int __signo) __THROW;
+ 
+ 
+ /* Time.  */
+ 
+ #ifdef __USE_XOPEN2K
+ /* Return the thread cpu clock.  */
+-extern int pthread_getcpuclockid (pthread_t thread, __clockid_t *clock);
++extern int pthread_getcpuclockid (pthread_t __thr, __clockid_t *__clock)
++	__THROW __nonnull ((2));
+ #endif
+ 
+ 
+ /* Scheduling.  */
+ 
+ /* Return thread THREAD's scheduling paramters.  */
+-extern int pthread_getschedparam (pthread_t thread, int *__restrict policy,
+-				  struct sched_param *__restrict param);
++extern int pthread_getschedparam (pthread_t __thr, int *__restrict __policy,
++				  struct sched_param *__restrict __param)
++	__THROW __nonnull ((2, 3));
+ 
+ /* Set thread THREAD's scheduling paramters.  */
+-extern int pthread_setschedparam (pthread_t thread, int policy,
+-				  const struct sched_param *param);
++extern int pthread_setschedparam (pthread_t __thr, int __policy,
++				  const struct sched_param *__param)
++	__THROW __nonnull ((3));
+ 
+ /* Set thread THREAD's scheduling priority.  */
+-extern int pthread_setschedprio (pthread_t thread, int prio);
++extern int pthread_setschedprio (pthread_t __thr, int __prio) __THROW;
+ 
+ #ifdef __USE_GNU
+ /* Yield the processor to another thread or process.
+    This function is similar to the POSIX `sched_yield' function but
+    might be differently implemented in the case of a m-on-n thread
+    implementation.  */
+-extern int pthread_yield (void);
++extern int pthread_yield (void) __THROW;
+ #endif
+ 
+ 
+--- a/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
++++ b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+@@ -33,6 +33,6 @@ extern int pthread_hurd_cond_wait_np (pt
+    See hurd_thread_cancel.  */
+ extern int pthread_hurd_cond_timedwait_np (pthread_cond_t *__restrict __cond,
+ 					   pthread_mutex_t *__restrict __mutex,
+-					   const struct timespec *abstime);
++					   const struct timespec *__abstime);
+ 
+ #endif /* bits/pthread-np.h */

Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/patches/series	2015-12-10 22:28:07 UTC (rev 6795)
@@ -146,6 +146,7 @@
 hurd-i386/cvs-s_scalbn.diff
 hurd-i386/local-mach_print.diff
 hurd-i386/cvs-hidden.diff
+hurd-i386/cvs-libpthread-api.diff
 
 i386/local-biarch.diff
 i386/local-cmov.diff
@@ -241,3 +242,4 @@
 any/local-static-dlopen-search-path.diff
 any/local-math-logb.diff
 any/cvs-grantpt-namespace.diff
+any/cvs-grantpt-pty-owner.diff

Modified: glibc-package/branches/glibc-2.22/debian/po/ar.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ar.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ar.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2010-09-09 01:07+0300\n"
 "Last-Translator: Ossama Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -224,3 +224,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ca.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ca.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ca.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: 2.11.2-6\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2010-10-23 11:57+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -235,3 +235,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/cs.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/cs.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/cs.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-07-15 20:40+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -241,3 +241,32 @@
 "při každé aktualizaci nabídnut seznam služeb, které se mají restartovat. "
 "Povolíte-li tuto možnost, budou se všechny potřebné služby restartovat při "
 "aktualizaci knihoven automaticky bez ptaní."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/da.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/da.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/da.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eglibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-01-20 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@@ -237,3 +237,32 @@
 "genstarte. Du kan vælge denne indstilling for at undgå at blive spurgt; i "
 "stedet for vil alle nødvendige genstarter blive udført automatisk, så du kan "
 "undgå spørgsmål ved hver biblioteksopgradering."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/de.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/de.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/de.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.13-22\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2011-12-14 19:39+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -243,3 +243,32 @@
 "zu vermeiden; stattdessen werden alle notwendigen Dienste-Neustarts f� "
 "automatisch vorgenommen und die Beantwortung von Fragen bei jedem Upgrade "
 "von Bibliotheken vermieden."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/el.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/el.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/el.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2004-01-21 22:44EEST\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -220,3 +220,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/es.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/es.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/es.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.13-24\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-01-14 11:44+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -273,3 +273,32 @@
 "que se le solicite esta información; en su lugar, cada reinicio de servicio "
 "se hará de forma automática de forma que evitará que se le planteen "
 "preguntas cada vez que se actualice una biblioteca."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/eu.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/eu.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/eu.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2007-09-11 09:57+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -232,3 +232,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/fi.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/fi.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/fi.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2014-06-04 20:45+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -251,3 +251,32 @@
 "palveluista. Voit valita tämän vaihtoehdon, jos et halua nähdä kysymystä "
 "jokaisen kirjastopäivityksen yhteydessä. Tällöin tarvittavat palvelut "
 "käynnistetään uudelleen automaattisesti."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/fr.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/fr.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/fr.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2011-12-15 06:54+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -248,3 +248,32 @@
 "jour. Vous pouvez choisir ici que ce choix ne soit plus offert et que les "
 "redémarrages aient lieu systématiquement lors des mises à jour de "
 "bibliothèques."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/gl.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/gl.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/gl.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eglibc_2.11.2-2_gl\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2010-08-13 01:43+0200\n"
 "Last-Translator: Jorge Barreiro <yortx.barry@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -233,3 +233,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/hu.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/hu.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/hu.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2013-05-14 18:47+0200\n"
 "Last-Translator: Dr. Nagy Elemér Károly <eknagy@omikk.bme.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.d.o>\n"
@@ -239,3 +239,32 @@
 "minden frissítésnél megkérdezi az újraindítandó szolgáltatások listáját a "
 "rendszer. Dönthetsz úgy, hogy ne kérdezzen  - ilyenkor minden szükséges "
 "szolgáltatás-újraindítást elvégez a rendszer és nem kérdezget."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/it.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/it.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/it.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.19 debconf templates\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2014-08-31 18:55+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -46,10 +46,10 @@
 "default, particularly for new installations. Other character sets may be "
 "useful for backwards compatibility with older systems and software."
 msgstr ""
-"Scegliere quali «locale» generare. È opportuno scegliere i «locale» UTF-8, in "
-"particolare sulle nuove installazioni. Gli altri set di caratteri potrebbero "
-"essere utili per risolvere problemi di compatibilità all'indietro con sistemi "
-"o programmi più vecchi."
+"Scegliere quali «locale» generare. È opportuno scegliere i «locale» UTF-8, "
+"in particolare sulle nuove installazioni. Gli altri set di caratteri "
+"potrebbero essere utili per risolvere problemi di compatibilità all'indietro "
+"con sistemi o programmi più vecchi."
 
 #. Type: select
 #. Choices
@@ -162,8 +162,8 @@
 msgid ""
 "Note: restarting sshd/telnetd should not affect any existing connections."
 msgstr ""
-"Nota: il riavvio di sshd/telnetd non ha alcun effetto sulle connessioni "
-"già attive."
+"Nota: il riavvio di sshd/telnetd non ha alcun effetto sulle connessioni già "
+"attive."
 
 #. Type: error
 #. Description
@@ -239,3 +239,32 @@
 "sia chiesta la conferma del riavvio accettando questa opzione; saranno "
 "effettuati automaticamente tutti i riavvii necessari senza fare domande per "
 "ogni aggiornamento della libreria."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ja.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ja.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ja.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: eglibc_2.13-38\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-12-31 23:29+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -247,3 +247,32 @@
 "選択するとその質問を避けられます。代わりに、再起動が必要な場合は全て自動で再"
 "起動させるため、ライブラリをアップグレードする度に質問されるのを避けられま"
 "す。"
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ko.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ko.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ko.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2008-03-02 20:33-0500\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -223,3 +223,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/lt.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/lt.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/lt.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2008-02-26 23:36+0200\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
@@ -224,3 +224,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ml.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ml.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ml.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Glibc 2007_05_26\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2007-05-26 15:09+0530\n"
 "Last-Translator: അനൂപ്|Anoop പി|P <gnuanu@gmail.com>, ലാലു|Lalu കെആര്‍|KR "
 "<frecolalu@gmail.com>,സജീവ് |Sajeev പിആര്‍|PR <saju_rrk@yahoo.com>\n"
@@ -208,3 +208,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/nb.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/nb.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/nb.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: glibc_nb\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2011-12-29 12:39+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -238,3 +238,32 @@
 "valget for å slippe å bli spurt, da blir i stedet alle nødvendige omstarter "
 "gjort automatisk slik at du ikke får spørsmål ved hver "
 "biblioteksoppgradering."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/nl.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/nl.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/nl.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eglibc 2.13-23\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2011-12-19 13:23+0100\n"
 "Last-Translator: Vincent Zweije <vincent@zweije.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -244,3 +244,32 @@
 "meer aan u gevraagd. In plaats daarvan worden alle noodzakelijke herstarts "
 "automatisch gedaan zodat u geen vragen krijgt bij elke opwaardering van een "
 "bibliotheek."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/pl.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/pl.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/pl.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: debconf-glibc-locales-pl\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-01-28 15:33+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -237,3 +237,32 @@
 "opcję, aby zapobiec takim pytaniom; wtedy wszystkie potrzebne restarty "
 "odbędą się automatycznie, a użytkownik uniknie pytania przy każdej "
 "aktualizacji biblioteki."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/pt.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/pt.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/pt.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-05-28 22:55+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -239,3 +239,32 @@
 "reiniciar. Pode escolher esta opção para que os reinícios necessários sejam "
 "automaticamente tratados pelo processo de actualização em vez de lhe serem "
 "colocadas questões."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/pt_BR.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/pt_BR.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/pt_BR.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2015-09-18 20:29-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -244,3 +244,32 @@
 "escolher esta opção para evitar novas solicitações; ao invés disso, todas as "
 "reinicializações necessárias serão realizadas automaticamente, para evitar "
 "que você responda a cada atualização de biblioteca."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ro.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ro.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ro.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2008-02-17 12:48+0200\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n"
 "Language-Team: romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -229,3 +229,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ru.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ru.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ru.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: eglibc 2.13-23\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2011-12-17 09:26+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -245,3 +245,32 @@
 "список служб, которые нужно перезапустить. Чтобы этот вопрос не задавался, "
 "вы можете ответить утвердительно; в этом случае все необходимые службы будут "
 "перезапущены автоматически."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/sk.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/sk.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/sk.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: eglibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2012-06-17 20:43+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
@@ -239,3 +239,32 @@
 "viac nepýtal, ale aby sa namiesto toho všetky potrebné reštarty vykonávali "
 "automaticky, takže sa vyhnete kladeniu otázok pri každej aktualizácii "
 "knižnice."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/sv.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/sv.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/sv.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc_2.7-11_sv\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2014-06-12 22:58+0200\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -238,3 +238,32 @@
 "uppgradering där en lista med tjänster som ska startas om presenteras. Du "
 "kan välja att aktivera detta alternativ för att undvika att frågan ställs. "
 "Istället kommer alla nödvändiga omstarter att göras automatiskt."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/ta.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/ta.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/ta.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2007-04-24 19:42+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
@@ -203,3 +203,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/templates.pot
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/templates.pot	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/templates.pot	2015-12-10 22:28:07 UTC (rev 6795)
@@ -1,6 +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.
+# This file is distributed under the same license as the glibc package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -193,3 +193,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/tr.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/tr.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/tr.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -6,16 +6,16 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2014-08-01 03:34+0200\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: debian-l10n-turkish <debian-l10n-turkish@lists.debian.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.4\n"
-"Language: tr\n"
 
 #. Type: multiselect
 #. Choices
@@ -243,3 +243,32 @@
 "seçeneği kullanabilirsiniz. Bu seçenek seçildiği takdirde bir kitaplık "
 "yükseltmesi yapılırken gereken tüm yeniden başlatma işlemleri size "
 "sorulmaksızın otomatik olarak yapılacaktır."
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/uk.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/uk.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/uk.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2006-02-21 10:12+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -217,3 +217,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/vi.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/vi.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/vi.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: eglibc 2.11.2-6\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2010-10-27 14:55+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -234,3 +234,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/po/zh_CN.po
===================================================================
--- glibc-package/branches/glibc-2.22/debian/po/zh_CN.po	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/po/zh_CN.po	2015-12-10 22:28:07 UTC (rev 6795)
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.7-9\n"
 "Report-Msgid-Bugs-To: glibc@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-21 00:04+0200\n"
+"POT-Creation-Date: 2015-12-07 14:56+0100\n"
 "PO-Revision-Date: 2008-02-28 23:44+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <debian-chinese-gb@lists.debian.org>\n"
@@ -218,3 +218,32 @@
 "necessary restarts will be done for you automatically so you can avoid being "
 "asked questions on each library upgrade."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid "Kernel must be upgraded"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../debhelper.in/libc.templates:6001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Please upgrade your kernel before installing glibc."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid "Kernel version not supported"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../debhelper.in/libc.templates:7001
+msgid ""
+"This version of the GNU libc requires kernel version ${kernel_ver} or "
+"later.  Older versions might work but are not officially supported.  Please "
+"consider upgrading your kernel."
+msgstr ""

Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk	2015-12-10 22:28:07 UTC (rev 6795)
@@ -1,6 +1,7 @@
 libc_rtlddir = /lib64
 extra_config_options = --enable-multi-arch --enable-lock-elision
 mvec = yes
+MIN_KERNEL_SUPPORTED := 2.6.32
 
 # build 32-bit (i386) alternative library
 GLIBC_MULTILIB_PASSES += i386

Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk	2015-12-10 22:25:22 UTC (rev 6794)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/i386.mk	2015-12-10 22:28:07 UTC (rev 6795)
@@ -1,4 +1,5 @@
 extra_config_options = --enable-multi-arch --enable-lock-elision
+MIN_KERNEL_SUPPORTED := 2.6.32
 
 # We use -march=i686 and glibc's i686 routines use cmov, so require it.
 # A Debian-local glibc patch adds cmov to the search path.


Reply to: