GNU C Library master sources branch master updated. glibc-2.16-ports-merge-661-g9ec6f8b

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  9ec6f8bd90e485c122af91f68ba3962380a9f6d4 (commit)
      from  0aa8f8a17fdeebce1a87c0c2e664f47734505f61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9ec6f8bd90e485c122af91f68ba3962380a9f6d4

commit 9ec6f8bd90e485c122af91f68ba3962380a9f6d4
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Sat Nov 10 00:31:20 2012 +0000

    Use glibc version information in zic and zdump.

diff --git a/ChangeLog b/ChangeLog
index d0a9145..538c4519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-11-09  Joseph Myers  <joseph@codesourcery.com>
 
+	* timezone/version.h: Remove file.
+	* timezone/README: Do not refer to version.h.
+	* timezone/Makefile ($(objpfx)zic.o): New dependency on
+	$(objpfx)version.h.
+	($(objpfx)zdump.o): Likewise.
+	($(objpfx)/version.h): New target.
+
 	* timezone/tzselect.ksh: Change to verbatim copy from tzcode
 	2012i.
 	* timezone/README: Don't mention modification to tzselect.ksh.
diff --git a/timezone/Makefile b/timezone/Makefile
index 49d3b9d..87b03e2 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -54,6 +54,13 @@ include ../Rules
 
 $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
 
+$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h
+
+$(objpfx)version.h: $(common-objpfx)config.make
+	echo 'static char const TZVERSION[]="$(PKGVERSION)$(version)";' \
+	    > $@.new
+	mv -f $@.new $@
+
 tz-cflags = -DTZDIR='"$(zonedir)"' \
 	    -DTZDEFAULT='"$(localtime-file)"' \
 	    -DTZDEFRULES='"$(posixrules-file)"' \
diff --git a/timezone/README b/timezone/README
index da3f20d..7a5e31c 100644
--- a/timezone/README
+++ b/timezone/README
@@ -1,9 +1,7 @@
 The files
 	zic.c zdump.c ialloc.c scheck.c tzfile.h
 	private.h tzselect.ksh checktab.awk
-come from the tzcode package by Arthur David Olson et.al.; the file
-	version.h
-has the contents that would be generated by that package's Makefile.
+come from the tzcode package by Arthur David Olson et.al.
 
 The files
 	africa antarctica asia australasia europe
diff --git a/timezone/version.h b/timezone/version.h
deleted file mode 100644
index 0873ea1..0000000
--- a/timezone/version.h
+++ /dev/null
@@ -1 +0,0 @@
-static char const TZVERSION[]="tz2012i";

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    7 +++++++
 timezone/Makefile  |    7 +++++++
 timezone/README    |    4 +---
 timezone/version.h |    1 -
 4 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 timezone/version.h


hooks/post-receive
-- 
GNU C Library master sources