[arch-commits] Commit in glibc/repos (3 files)

[Allan McRae]

    Date: Wednesday, April 29, 2009 @ 06:52:27
  Author: allan
Revision: 36987

Merged revisions 36985 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/glibc/trunk

........
  r36985 | allan | 2009-04-29 09:54:52 +0000 (Wed, 29 Apr 2009) | 2 lines
  
  upgpkg: glibc 2.9-7
      oops...
........

Modified:
  glibc/repos/testing-x86_64/	(properties)
  glibc/repos/testing-x86_64/ChangeLog
  glibc/repos/testing-x86_64/PKGBUILD

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)


Property changes on: glibc/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /glibc/trunk:1-36908
   + /glibc/trunk:1-36986

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2009-04-29 09:56:01 UTC (rev 36986)
+++ testing-x86_64/ChangeLog	2009-04-29 10:52:27 UTC (rev 36987)
@@ -1,3 +1,6 @@
+glibc 2.9-7
+- actually apply patch "applied" in 2.9-6...
+
 glibc 2.9-6
 - apply upstream patch to fix gdb issue
   due to gcc optimization

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-29 09:56:01 UTC (rev 36986)
+++ testing-x86_64/PKGBUILD	2009-04-29 10:52:27 UTC (rev 36987)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.9
-pkgrel=6
+pkgrel=7
 _glibcdate=20090418
 install=glibc.install
 backup=(etc/locale.gen
@@ -53,7 +53,7 @@
   patch -Np1 -i ${srcdir}/glibc-patches/glibc-fixes1.patch || return 1
 
   # fixes for gdb taken from upstream cvs, fixed FS#14481
-  patch -Np1 -i ${srcdir}/glibc-patches/glibc-2.9-libhread_db.patch
+  patch -Np0 -i ${srcdir}/glibc-patches/glibc-2.9-libthread_db.patch || return 1
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf