3.0.7 RC0

8 files changed, 10 insertions, 19 deletions

diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index 79ffc2a..8b44382 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Xdelta3], [3.0.6], [josh.macdonald@gmail.com], 
+AC_INIT([Xdelta3], [3.0.7], [josh.macdonald@gmail.com], 
         [xdelta3], [http://xdelta.org/])
 AC_PREREQ([2.68])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index 2c13f63..a204d74 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -342,12 +342,6 @@ public:
     return true;
   }
 
-  // Check whether a real file matches another
-  bool EqualsSpec(const ExtFile &other) const {
-    int ret = compare_files(Name(), other.Name());
-    return true;
-  }
-
 protected:
   string filename_;
 };
diff --git a/xdelta3/xdelta3-lzma.h b/xdelta3/xdelta3-lzma.h
index ef81bb0..89c0f1e 100644
--- a/xdelta3/xdelta3-lzma.h
+++ b/xdelta3/xdelta3-lzma.h
@@ -1,5 +1,5 @@
 /* xdelta 3 - delta compression tools and library
- * Copyright (C) 2012.  Joshua P. MacDonald
+ * Copyright (C) 2012, 2013.  Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 8d32938..022ede0 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1,6 +1,6 @@
 /* xdelta3 - delta compression tools and library
  * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- * 2009, 2010, 2011, 2012 Joshua P. MacDonald
+ * 2009, 2010, 2011, 2012, 2013 Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -296,10 +296,7 @@ static main_extcomp extcomp_types[] =
   { "gzip",     "-c",   "gzip",       "-dc",   "G", "\037\213",     2, 0 },
   { "compress", "-c",   "uncompress", "-c",    "Z", "\037\235",     2, 0 },
 
-  /* TODO: add commandline support for magic-less formats */
-  /*{ "lzma", "-c",   "lzma", "-dc",   "M", "]\000", 2, 0 },*/
-
-  /* Xz is lzma with a magic number http://tukaani.org/xz/ */
+  /* Xz is lzma with a magic number http://tukaani.org/xz/format.html */
   { "xz", "-c", "xz", "-dc", "Y", "\xfd\x37\x7a\x58\x5a\x00", 2, 0 },
 };
 
@@ -360,8 +357,8 @@ xprintf (const char *fmt, ...)
 static int
 main_version (void)
 {
-  /* $Format: "  XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\\n\");" $ */
-  XPR(NTR "Xdelta version 3.0.6, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n");
+  /* $Format: "  XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, Joshua MacDonald\\n\");" $ */
+  XPR(NTR "Xdelta version 3.0.7, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Joshua MacDonald\n");
   XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   XPR(NTR "This is free software, and you are welcome to redistribute it\n");
   XPR(NTR "under certain conditions; see \"COPYING\" for details.\n");
diff --git a/xdelta3/xdelta3-second.h b/xdelta3/xdelta3-second.h
index 02e27f6..1c8a406 100644
--- a/xdelta3/xdelta3-second.h
+++ b/xdelta3/xdelta3-second.h
@@ -1,5 +1,5 @@
 /* xdelta 3 - delta compression tools and library
- * Copyright (C) 2002, 2003, 2006, 2007.  Joshua P. MacDonald
+ * Copyright (C) 2002, 2003, 2006, 2007, 2013.  Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 3e1bc14..1367d99 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -1,6 +1,6 @@
 /* xdelta 3 - delta compression tools and library
  * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007,
- * 2008, 2009, 2010. Joshua P. MacDonald
+ * 2008, 2009, 2010, 2011, 2012, 2013. Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index e4d02b6..d6471fa 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -1,6 +1,6 @@
 /* xdelta 3 - delta compression tools and library
  * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007,
- * 2008, 2009, 2010.  Joshua P. MacDonald
+ * 2008, 2009, 2010, 2011, 2012, 2013.  Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index 74aaa8a..940a3a6 100644
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -9,7 +9,7 @@
 (Checkin-Login jmacd)
 (Populate-Ignore ("\\.svn"))
 (Project-Keywords
- (Xdelta3Version "3.0.6")
+ (Xdelta3Version "3.0.7")
  )
 (Files
   (COPYING (xdelta3/b/29_COPYING 1.1 744))