Author: adconrad
Date: 2014-02-20 22:42:37 +0000 (Thu, 20 Feb 2014)
New Revision: 5947
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
Log:
Merge with 2.18 and drop duplicate changelog entry
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-20 22:40:37 UTC
(rev 5946)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-20 22:42:37 UTC
(rev 5947)
@@ -35,7 +35,6 @@
* debian/sysdeps/powerpc.mk: Follow rename of stubs-64.h to stubs-64-v1.h.
* debian/patches/any/submitted-sysdeps-auxv.diff: Fix implicit declaration
when including <sys/auxv.h> in the testsuite by fixing up header guards.
- * debian/debhelper.in/libc.postinst: Track samba to smbd service mangling.
-- Adam Conrad <[email protected]> Sun, 09 Feb 2014 09:46:13 -0700
@@ -49,6 +48,7 @@
no longer apply pointer encryption to the frame pointer (LP: #1268937)
* debian/patches/powerpc/cvs-gettimeofday-32.diff: Replace the submitted
version of this patch with the upstream commit, which also fixes time.
+ * debian/debhelper.in/libc.postinst: Track samba to smbd service rename.
[ Aurelien Jarno ]
* debian/testsuite-checking/expected-results-mips*: Update following
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
