r3543 - in glibc-package/branches/eglibc-2.10/debian: . patches/kfreebsd
Author: aurel32
Date: 2009-05-26 14:53:53 +0000 (Tue, 26 May 2009)
New Revision: 3543
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff
Log:
Merge from trunk, revisions 3537-3541
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-26 14:50:30 UTC (rev 3542)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-26 14:53:53 UTC (rev 3543)
@@ -104,20 +104,20 @@
* debian/debhelper.in/locales.config: use previous debconf settings if
/etc/environment and /etc/default/locale do not exist.
* debian/bug/locales/presubj: fix a typo. Closes: #528353.
- * debian/local/manpages/validlocale.8: fix a typo. Closes #528658.
+ * debian/local/manpages/validlocale.8: fix a typo. Closes: #528658.
* debian/patches/any/cvs-sunrpc-license.diff: new patch from upstream
to change the SUNRPC license into BSD one. Update debian/copyright
accordingly. Closes: #382175.
* debian/patches/any/submitted-tst-cpucount.diff: new patch to fix
tst-cpucount test on non Linux kernels.
- * kfreebsd/local-sysdeps.diff: update to revision 2544 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2545 (from glibc-bsd).
* debian/patches/kfreebsd/local-config_h_in.patch: new patch to correctly
define __KFREEBSD_KERNEL_VERSION.
* debian/sysdeps/kfreebsd.mk: bump minimal kernel version to 6.0.
* debian/debhelper.in/libc.NEWS: detail the exact line that has to be
added to /etc/resolv.conf.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 26 May 2009 08:32:00 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 26 May 2009 13:45:58 +0200
eglibc (2.9-12) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-05-26 14:50:30 UTC (rev 3542)
+++ glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-05-26 14:53:53 UTC (rev 3543)
@@ -19804,8 +19804,8 @@
+lchmod - lchmod i:si lchmod
+lchown - lchown i:sii __lchown lchown
+sys_lio_listio - lio_listio i:ibnP __syscall_lio_listio
-+sys_lseek EXTRA lseek i:iii __syscall_lseek
-+sys_freebsd6_lseek EXTRA freebsd6_lseek i:iiii __syscall_freebsd6_lseek
++sys_lseek - lseek i:iii __syscall_lseek
++sys_freebsd6_lseek - freebsd6_lseek i:iiii __syscall_freebsd6_lseek
+sys_lstat - lstat i:sp __syscall_lstat
+lutimes - lutimes i:sp __lutimes lutimes
+posix_madvise - madvise i:pii posix_madvise
Reply to: