From 5109688803f13e7c4f5153674acccc00ea128f76 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Fri, 8 Jul 2011 13:09:41 -0500
Subject: [PATCH] [master] Added vstudio/* and CMakeLists to EXTRA_DIST in
 Makefile.in

and Makefile.am
---
 ANNOUNCE    | 39 +++++++++++++--------------------------
 CHANGES     |  3 +++
 Makefile.am |  1 +
 Makefile.in |  3 ++-
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index bb55c7f81..034172fe2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,46 +1,33 @@
 
-Libpng 1.4.8 - July 7, 2011
+Libpng 1.4.9beta01 - July 8, 2011
 
-This is a public release of libpng, intended for use in production codes.
+This is not intended to be a public release.  It will be replaced
+within a few weeks by a public version or by another test version.
 
 Files available for download:
 
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   libpng-1.4.8.tar.xz (LZMA-compressed, recommended)
-   libpng-1.4.8.tar.gz
-   libpng-1.4.8.tar.bz2
+   1.4.9beta01.tar.xz (LZMA-compressed, recommended)
+   1.4.9beta01.tar.gz
+   1.4.9beta01.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lpng148.7z (LZMA-compressed, recommended)
-   lpng148.zip
+   lp149b01.7z (LZMA-compressed, recommended)
+   lp149b01.zip
 
 Other information:
 
-   libpng-1.4.8-README.txt
-   libpng-1.4.8-LICENSE.txt
+   1.4.9beta01-README.txt
+   1.4.9beta01-LICENSE.txt
 
-Changes since the last public release (1.4.7):
+Changes since the last public release (1.4.8):
 
-  Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined.
-  Copied png_debug macros from pngpriv.h into pngtest.c and removed
-    "#include pngpriv.h" from pngtest.c, to avoid setting a bad example.
-  Pass "" instead of '\0' to png_default_error() in png_err().  This mistake
-    was introduced in libpng-1.2.20beta01.
-  Check for up->location !PNG_AFTER_IDAT when writing unknown chunks
-    before IDAT.
-  Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
-    always expand to RGBA if transparency is present.
-  Ported bugfix in pngrtran.c from 1.5.3: Ensure coefficients are OK for
-    png_rgb_to_gray_fixed(); check for integer overflow in
-    png_set_rgb_to_gray().
-  Fixed uninitialized memory read in png_format_buffer() (Bug report by
-    Frank Busse, related to CVE-2004-0421).
-  Fixed error in "ACCURATE" 16-to-8 scaling (John Bowler).
-  Check for sCAL chunk too short.
+version 1.4.9beta01 [July 8, 2011]
+  Added vstudio/* and CMakeLists to EXTRA_DIST in Makefile.in and Makefile.am
 
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 058c68680..61bb14a6d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2826,6 +2826,9 @@ version 1.4.8rc01 [June 30, 2011]
 version 1.4.8 [July 7, 2011]
   No changes.
 
+version 1.4.9beta01 [July 8, 2011]
+  Added vstudio/* and CMakeLists to EXTRA_DIST in Makefile.in and Makefile.am
+
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
diff --git a/Makefile.am b/Makefile.am
index b0bd77e4f..2404c74a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,6 +64,7 @@ EXTRA_DIST= \
 	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
 	${srcdir}/projects/visualc6/* \
 	${srcdir}/projects/visualc71/* \
+	${srcdir}/projects/vstudio/* \
 	${srcdir}/projects/xcode/* \
 	${srcdir}/scripts/* \
 	${srcdir}/contrib/gregbook/* \
diff --git a/Makefile.in b/Makefile.in
index 814c600b9..dc6648480 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -319,8 +319,9 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
 
 #extra source distribution files.
 EXTRA_DIST = \
-	ANNOUNCE CHANGES INSTALL LICENSE README TODO \
+	ANNOUNCE CHANGES INSTALL LICENSE README TODO CMakeLists.txt \
 	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
+	${srcdir}/projects/vstudio/* \
 	${srcdir}/projects/visualc6/* \
 	${srcdir}/projects/visualc71/* \
 	${srcdir}/projects/xcode/* \