Tue, 03 Apr 2012 09:59:09 -0700 Google Inc. <opensource@google.com>

  Release version 0.8.3 with the following changes:
  * Issue #34: Move zconf.h, zlib.h, and adler32.c into a zlib subdirectory to
    avoid conflicts with other revisions of these files included in Chromium.
    Please see: http://codereview.chromium.org/9555002/
  * Issue #32: Fix erroneous parameter in unit test.


git-svn-id: http://open-vcdiff.googlecode.com/svn/trunk@41 132ac840-3546-0410-a738-d3f8764196be

13 files changed, 45 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f96e4f..8225454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue, 03 Apr 2012 09:59:09 -0700  Google Inc. <opensource@google.com>
+
+  Release version 0.8.3 with the following changes:
+  * Issue #34: Move zconf.h, zlib.h, and adler32.c into a zlib subdirectory to
+    avoid conflicts with other revisions of these files included in Chromium.
+    Please see: http://codereview.chromium.org/9555002/
+  * Issue #32: Fix erroneous parameter in unit test.
+
 Tue, 27 Sep 2011 10:30:38 -0700  Google Inc. <opensource@google.com>
 
   Release version 0.8.2 with the following changes:
diff --git a/Makefile.am b/Makefile.am
index b16c184..5c765c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ ACLOCAL_AMFLAGS = -I m4 \
 
 # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h>
 AM_CPPFLAGS = -I$(top_srcdir)/src \
+              -I$(top_srcdir)/src/zlib \
               -I$(top_srcdir)/gflags/src \
               -I$(top_srcdir)/gtest \
               -I$(top_srcdir)/gtest/include
@@ -111,9 +112,9 @@ libvcdcom_la_SOURCES = src/google/format_extension_flags.h \
 		       src/logging.h \
 		       src/varint_bigendian.h \
 		       src/vcdiff_defs.h \
-		       src/zlib.h \
-		       src/zconf.h \
-		       src/adler32.c \
+		       src/zlib/zlib.h \
+		       src/zlib/zconf.h \
+		       src/zlib/adler32.c \
 		       src/addrcache.cc \
 		       src/codetable.cc \
 		       src/logging.cc \
diff --git a/Makefile.in b/Makefile.in
index c3cbdf3..8fd75d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,6 +406,7 @@ ACLOCAL_AMFLAGS = -I m4 \
 
 # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h>
 AM_CPPFLAGS = -I$(top_srcdir)/src \
+              -I$(top_srcdir)/src/zlib \
               -I$(top_srcdir)/gflags/src \
               -I$(top_srcdir)/gtest \
               -I$(top_srcdir)/gtest/include
@@ -488,9 +489,9 @@ libvcdcom_la_SOURCES = src/google/format_extension_flags.h \
 		       src/logging.h \
 		       src/varint_bigendian.h \
 		       src/vcdiff_defs.h \
-		       src/zlib.h \
-		       src/zconf.h \
-		       src/adler32.c \
+		       src/zlib/zlib.h \
+		       src/zlib/zconf.h \
+		       src/zlib/adler32.c \
 		       src/addrcache.cc \
 		       src/codetable.cc \
 		       src/logging.cc \
@@ -912,12 +913,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-adler32.lo: src/adler32.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adler32.lo -MD -MP -MF $(DEPDIR)/adler32.Tpo -c -o adler32.lo `test -f 'src/adler32.c' || echo '$(srcdir)/'`src/adler32.c
+adler32.lo: src/zlib/adler32.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adler32.lo -MD -MP -MF $(DEPDIR)/adler32.Tpo -c -o adler32.lo `test -f 'src/zlib/adler32.c' || echo '$(srcdir)/'`src/zlib/adler32.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/adler32.Tpo $(DEPDIR)/adler32.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/adler32.c' object='adler32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/zlib/adler32.c' object='adler32.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.lo `test -f 'src/adler32.c' || echo '$(srcdir)/'`src/adler32.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.lo `test -f 'src/zlib/adler32.c' || echo '$(srcdir)/'`src/zlib/adler32.c
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/THANKS b/THANKS
index ef12966..e5227b3 100644
--- a/THANKS
+++ b/THANKS
@@ -42,4 +42,5 @@ Adeodato Simo
 Ben Smith
 Todd Turnidge
 Linus Upson
+Xianzhu Wang
 
diff --git a/configure b/configure
index a104c9a..5a10de4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for open-vcdiff 0.8.2.
+# Generated by GNU Autoconf 2.65 for open-vcdiff 0.8.3.
 #
 # Report bugs to <opensource@google.com>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='open-vcdiff'
 PACKAGE_TARNAME='open-vcdiff'
-PACKAGE_VERSION='0.8.2'
-PACKAGE_STRING='open-vcdiff 0.8.2'
+PACKAGE_VERSION='0.8.3'
+PACKAGE_STRING='open-vcdiff 0.8.3'
 PACKAGE_BUGREPORT='opensource@google.com'
 PACKAGE_URL=''
 
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures open-vcdiff 0.8.2 to adapt to many kinds of systems.
+\`configure' configures open-vcdiff 0.8.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1513,7 +1513,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of open-vcdiff 0.8.2:";;
+     short | recursive ) echo "Configuration of open-vcdiff 0.8.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1619,7 +1619,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-open-vcdiff configure 0.8.2
+open-vcdiff configure 0.8.3
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2165,7 +2165,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by open-vcdiff $as_me 0.8.2, which was
+It was created by open-vcdiff $as_me 0.8.3, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2975,7 +2975,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='open-vcdiff'
- VERSION='0.8.2'
+ VERSION='0.8.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16014,7 +16014,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by open-vcdiff $as_me 0.8.2, which was
+This file was extended by open-vcdiff $as_me 0.8.3, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16080,7 +16080,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-open-vcdiff config.status 0.8.2
+open-vcdiff config.status 0.8.3
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 842e8ea..3005c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(open-vcdiff, 0.8.2, opensource@google.com)
+AC_INIT(open-vcdiff, 0.8.3, opensource@google.com)
 AC_CONFIG_SRCDIR(README)
 AC_CONFIG_MACRO_DIR(m4)
 AM_INIT_AUTOMAKE
diff --git a/packages/deb/changelog b/packages/deb/changelog
index fc0d9d5..bdbb73f 100644
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,3 +1,9 @@
+open-vcdiff (0.8.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Google Inc. <opensource@google.com>  Tue, 03 Apr 2012 09:59:09 -0700
+
 open-vcdiff (0.8.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/src/vcdiffengine_test.cc b/src/vcdiffengine_test.cc
index 3c2a909..a435dcd 100644
--- a/src/vcdiffengine_test.cc
+++ b/src/vcdiffengine_test.cc
@@ -510,7 +510,7 @@ TEST_F(VCDiffEngineTest, EngineEncodeSampleTextWithTargetMatching) {
 }
 
 TEST_F(VCDiffEngineTest, EngineEncodeSampleTextInterleavedWithTargetMatching) {
-  Encode(/* interleaved = */ true, /* target matching = */ false);
+  Encode(/* interleaved = */ true, /* target matching = */ true);
   // Interleaved section
   if (!ExpectAddCopyInstruction(kBlockSize, (3 * kBlockSize) - 1,
                                 VCD_SELF_MODE)) {
diff --git a/src/adler32.c b/src/zlib/adler32.c
index b8f37bb..b8f37bb 100644
--- a/src/adler32.c
+++ b/src/zlib/adler32.c
diff --git a/src/zconf.h b/src/zlib/zconf.h
index a4a2115..a4a2115 100644
--- a/src/zconf.h
+++ b/src/zlib/zconf.h
diff --git a/src/zlib.h b/src/zlib/zlib.h
index 6f64b98..6f64b98 100644
--- a/src/zlib.h
+++ b/src/zlib/zlib.h
diff --git a/vsprojects/config.h b/vsprojects/config.h
index 6394697..5aacfac 100644
--- a/vsprojects/config.h
+++ b/vsprojects/config.h
@@ -52,7 +52,7 @@
 #define PACKAGE_NAME "open-vcdiff"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "open-vcdiff 0.8.2"
+#define PACKAGE_STRING "open-vcdiff 0.8.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "open-vcdiff"
@@ -61,7 +61,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.8.2"
+#define PACKAGE_VERSION "0.8.3"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -70,7 +70,7 @@
 #define STL_NAMESPACE std
 
 /* Version number of package */
-#define VERSION "0.8.2"
+#define VERSION "0.8.3"
 
 /* Stops putting the code inside the Google namespace */
 #define _END_GOOGLE_NAMESPACE_ }
diff --git a/vsprojects/vcdcom/vcdcom.vcproj b/vsprojects/vcdcom/vcdcom.vcproj
index 9990bd8..8c3637b 100644
--- a/vsprojects/vcdcom/vcdcom.vcproj
+++ b/vsprojects/vcdcom/vcdcom.vcproj
@@ -181,11 +181,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zconf.h"
+				RelativePath="..\..\src\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zlib.h"
+				RelativePath="..\..\src\zlib\zlib.h"
 				>
 			</File>
 			<File
@@ -209,7 +209,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\adler32.c"
+				RelativePath="..\..\src\zlib\adler32.c"
 				>
 			</File>
 			<File