Author: aurel32
Date: 2009-07-12 22:39:34 +0000 (Sun, 12 Jul 2009)
New Revision: 3622

Added:
   glibc-package/branches/eglibc-2.10/debian/sysdeps/sh4.mk
Modified:
   glibc-package/branches/eglibc-2.10/debian/changelog
   glibc-package/branches/eglibc-2.10/debian/control
   glibc-package/branches/eglibc-2.10/debian/control.in/main
Log:
Merge from trunk, revisions 3516-3620.



Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-12 22:34:10 UTC 
(rev 3621)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-12 22:39:34 UTC 
(rev 3622)
@@ -114,7 +114,7 @@
   [ Aurelien Jarno ]
   * Don't ship /usr/include/scsi/scsi.h anymore.  Closes: #535809.
   * Add sysdeps/sh4.mk.  Closes: #536199. 
-  * debian/control.in/main: Build-Conflicts on dpkg-dev (= 1.15.3).
+  * debian/control.in/main: Build-Depends on dpkg-dev (>= 1.15.3.1).
     Closes: #536482.
   * kfreebsd/local-sysdeps.diff: update to revision 2624 (from glibc-bsd).
 

Modified: glibc-package/branches/eglibc-2.10/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control   2009-07-12 22:34:10 UTC 
(rev 3621)
+++ glibc-package/branches/eglibc-2.10/debian/control   2009-07-12 22:39:34 UTC 
(rev 3622)
@@ -1,7 +1,7 @@
 Source: eglibc
 Section: libs
 Priority: required
-Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.14.17), bzip2, lzma, 
file, quilt,
+Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.15.3.1), bzip2, lzma, 
file, quilt,
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
  linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev 
[hurd-i386], libpthread-stubs0-dev [hurd-i386],
@@ -10,10 +10,9 @@
  g++-4.3 (>= 4.3.0-7), g++-4.3-multilib [amd64 i386 kfreebsd-amd64 mips mipsel 
powerpc ppc64 s390 sparc],
  g++-4.3 (>= 4.3.3-2) [alpha]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
-Build-Conflicts: dpkg-dev (= 1.15.3)
 Maintainer: GNU Libc Maintainers <[email protected]>
 Uploaders: Ben Collins <[email protected]>, GOTO Masanori 
<[email protected]>, Philip Blundell <[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.1
+Standards-Version: 3.8.2
 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/eglibc-2.10/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control.in/main   2009-07-12 
22:34:10 UTC (rev 3621)
+++ glibc-package/branches/eglibc-2.10/debian/control.in/main   2009-07-12 
22:39:34 UTC (rev 3622)
@@ -1,7 +1,7 @@
 Source: eglibc
 Section: libs
 Priority: required
-Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.14.17), bzip2, lzma, 
file, quilt,
+Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.15.3.1), bzip2, lzma, 
file, quilt,
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
  linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev 
[hurd-i386], libpthread-stubs0-dev [hurd-i386],
@@ -10,10 +10,9 @@
  g++-4.3 (>= 4.3.0-7), g++-4.3-multilib [amd64 i386 kfreebsd-amd64 mips mipsel 
powerpc ppc64 s390 sparc],
  g++-4.3 (>= 4.3.3-2) [alpha]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
-Build-Conflicts: dpkg-dev (= 1.15.3)
 Maintainer: GNU Libc Maintainers <[email protected]>
 Uploaders: Ben Collins <[email protected]>, GOTO Masanori 
<[email protected]>, Philip Blundell <[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.1
+Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
 Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
 

Added: glibc-package/branches/eglibc-2.10/debian/sysdeps/sh4.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/sysdeps/sh4.mk                    
        (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/sysdeps/sh4.mk    2009-07-12 
22:39:34 UTC (rev 3622)
@@ -0,0 +1,4 @@
+libc_add-ons = ports nptl $(add-ons)
+
+# Renesas SH enabled -ffinte-math-only. Some software need -mieee.
+extra_cflags = -mieee


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to