Author: aurel32 Date: 2011-02-28 11:00:56 +0000 (Mon, 28 Feb 2011) New Revision: 4552
Modified: glibc-package/branches/multiarch/debian/changelog glibc-package/branches/multiarch/debian/control.in/main glibc-package/branches/multiarch/debian/patches/any/local-rtld.diff Log: Merge trunk into multiarch branch Modified: glibc-package/branches/multiarch/debian/changelog =================================================================== --- glibc-package/branches/multiarch/debian/changelog 2011-02-28 08:31:43 UTC (rev 4551) +++ glibc-package/branches/multiarch/debian/changelog 2011-02-28 11:00:56 UTC (rev 4552) @@ -1,4 +1,4 @@ -eglibc (2.11.2-13) UNRELEASED; urgency=low +eglibc (2.11.2-14) UNRELEASED; urgency=low [ Aurelien Jarno ] * Use the multiarch path for the native version and optimized flavors. @@ -25,6 +25,12 @@ -- Aurelien Jarno <[email protected]> Sat, 26 Feb 2011 18:28:26 +0100 +eglibc (2.11.2-13) unstable; urgency=low + + * Fix a typo in debian/patches/any/local-rtld.diff. Closes: #615806. + + -- Aurelien Jarno <[email protected]> Mon, 28 Feb 2011 07:09:56 +0100 + eglibc (2.11.2-12) unstable; urgency=medium [ Aurelien Jarno ] Modified: glibc-package/branches/multiarch/debian/control.in/main =================================================================== --- glibc-package/branches/multiarch/debian/control.in/main 2011-02-28 08:31:43 UTC (rev 4551) +++ glibc-package/branches/multiarch/debian/control.in/main 2011-02-28 11:00:56 UTC (rev 4552) @@ -10,7 +10,7 @@ g++-4.4 (>= 4.4.2-2), g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc] Build-Depends-Indep: perl, po-debconf (>= 1.0) Maintainer: GNU Libc Maintainers <[email protected]> -Uploaders: GOTO Masanori <[email protected]>, Jeff Bailey <[email protected]>, Daniel Jacobowitz <[email protected]>, Clint Adams <[email protected]>, Aurelien Jarno <[email protected]>, Pierre Habouzit <[email protected]> +Uploaders: GOTO Masanori <[email protected]>, Jeff Bailey <[email protected]>, Daniel Jacobowitz <[email protected]>, Clint Adams <[email protected]>, Aurelien Jarno <[email protected]>, Pierre Habouzit <[email protected]> Standards-Version: 3.8.4 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/ Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/ Modified: glibc-package/branches/multiarch/debian/patches/any/local-rtld.diff =================================================================== --- glibc-package/branches/multiarch/debian/patches/any/local-rtld.diff 2011-02-28 08:31:43 UTC (rev 4551) +++ glibc-package/branches/multiarch/debian/patches/any/local-rtld.diff 2011-02-28 11:00:56 UTC (rev 4552) @@ -54,7 +54,7 @@ -common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \ -+common-ldd-rewrite = -e 's%@RTLD@%$(rltddir)/$(rtld-installed-name)%g' \ ++common-ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's%@PKGVERSION@%$(PKGVERSION)%g' \ -e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g' -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
