r5442 - glibc-package/branches/eglibc-2.17/debian
Author: adconrad
Date: 2013-01-18 12:31:37 +0000 (Fri, 18 Jan 2013)
New Revision: 5442
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/rules
Log:
- Restricts ld.so self-loading checks to normal mode (LP: #1088677)
* debian/rules: Fix EGLIBC_VERSION epoch parsing breakage (LP: #929565)
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-16 03:54:44 UTC (rev 5441)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-18 12:31:37 UTC (rev 5442)
@@ -1,6 +1,7 @@
eglibc (2.17-0experimental0) UNRELEASED; urgency=low
* New upstream release: version 2.17, orig tarball built at SVN r22169:
+ - Restricts ld.so self-loading checks to normal mode (LP: #1088677)
- debian/rules.d/tarball.mk: ports is no longer external to libc.
- debian/*: Update all 2.16 occurences to 2.17 for upgrades/deps.
- patches/localedata/supported.diff: Rebased against new upstream.
@@ -59,6 +60,7 @@
* debian/sysdeps/{armel,armhf}.mk: Merge multilib configs from Ubuntu.
* debian/debhelper.in/libc.preinst: Fix preinst kernel check to match
the reality that we need >= 2.6.32, as found in squeeze/lucid/RHEL6.
+ * debian/rules: Fix EGLIBC_VERSION epoch parsing breakage (LP: #929565)
-- Adam Conrad <adconrad@0c3.net> Mon, 26 Nov 2012 02:20:40 -0700
Modified: glibc-package/branches/eglibc-2.17/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/rules 2013-01-16 03:54:44 UTC (rev 5441)
+++ glibc-package/branches/eglibc-2.17/debian/rules 2013-01-18 12:31:37 UTC (rev 5442)
@@ -60,7 +60,7 @@
DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-EGLIBC_VERSION = $(shell echo $(DEB_VERSION) | sed -e 's/-.*//')
+EGLIBC_VERSION = $(shell echo $(DEB_VERSION) | sed -e 's/.*://' -e 's/-.*//')
DEB_BUILDDIR ?= $(build-tree)/$(DEB_HOST_ARCH)-$(curpass)
Reply to: