diff options
author | josh.macdonald <jmacd@users.noreply.github.com> | 2013-05-14 05:35:52 +0000 |
---|---|---|
committer | josh.macdonald <jmacd@users.noreply.github.com> | 2013-05-14 05:35:52 +0000 |
commit | 0bc04475efa7611dccd291cf91411038fa5a667b (patch) | |
tree | 36b8848b510053f177cd9e3164291c58d50e650b /xdelta3 | |
parent | d60e9beffed2aa6ab8e2f00ef2037fbc194960f6 (diff) |
3.0.7 RC0
Diffstat (limited to 'xdelta3')
-rw-r--r-- | xdelta3/configure.ac | 2 | ||||
-rw-r--r-- | xdelta3/testing/file.h | 6 | ||||
-rw-r--r-- | xdelta3/xdelta3-lzma.h | 2 | ||||
-rw-r--r-- | xdelta3/xdelta3-main.h | 11 | ||||
-rw-r--r-- | xdelta3/xdelta3-second.h | 2 | ||||
-rw-r--r-- | xdelta3/xdelta3.c | 2 | ||||
-rw-r--r-- | xdelta3/xdelta3.h | 2 | ||||
-rw-r--r-- | xdelta3/xdelta3.prj | 2 |
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 @@ | |||
1 | AC_INIT([Xdelta3], [3.0.6], [josh.macdonald@gmail.com], | 1 | AC_INIT([Xdelta3], [3.0.7], [josh.macdonald@gmail.com], |
2 | [xdelta3], [http://xdelta.org/]) | 2 | [xdelta3], [http://xdelta.org/]) |
3 | AC_PREREQ([2.68]) | 3 | AC_PREREQ([2.68]) |
4 | AC_CONFIG_MACRO_DIR([m4]) | 4 | 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: | |||
342 | return true; | 342 | return true; |
343 | } | 343 | } |
344 | 344 | ||
345 | // Check whether a real file matches another | ||
346 | bool EqualsSpec(const ExtFile &other) const { | ||
347 | int ret = compare_files(Name(), other.Name()); | ||
348 | return true; | ||
349 | } | ||
350 | |||
351 | protected: | 345 | protected: |
352 | string filename_; | 346 | string filename_; |
353 | }; | 347 | }; |
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 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta 3 - delta compression tools and library |
2 | * Copyright (C) 2012. Joshua P. MacDonald | 2 | * Copyright (C) 2012, 2013. Joshua P. MacDonald |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License as published by | 5 | * 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 @@ | |||
1 | /* xdelta3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 2 | * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
3 | * 2009, 2010, 2011, 2012 Joshua P. MacDonald | 3 | * 2009, 2010, 2011, 2012, 2013 Joshua P. MacDonald |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -296,10 +296,7 @@ static main_extcomp extcomp_types[] = | |||
296 | { "gzip", "-c", "gzip", "-dc", "G", "\037\213", 2, 0 }, | 296 | { "gzip", "-c", "gzip", "-dc", "G", "\037\213", 2, 0 }, |
297 | { "compress", "-c", "uncompress", "-c", "Z", "\037\235", 2, 0 }, | 297 | { "compress", "-c", "uncompress", "-c", "Z", "\037\235", 2, 0 }, |
298 | 298 | ||
299 | /* TODO: add commandline support for magic-less formats */ | 299 | /* Xz is lzma with a magic number http://tukaani.org/xz/format.html */ |
300 | /*{ "lzma", "-c", "lzma", "-dc", "M", "]\000", 2, 0 },*/ | ||
301 | |||
302 | /* Xz is lzma with a magic number http://tukaani.org/xz/ */ | ||
303 | { "xz", "-c", "xz", "-dc", "Y", "\xfd\x37\x7a\x58\x5a\x00", 2, 0 }, | 300 | { "xz", "-c", "xz", "-dc", "Y", "\xfd\x37\x7a\x58\x5a\x00", 2, 0 }, |
304 | }; | 301 | }; |
305 | 302 | ||
@@ -360,8 +357,8 @@ xprintf (const char *fmt, ...) | |||
360 | static int | 357 | static int |
361 | main_version (void) | 358 | main_version (void) |
362 | { | 359 | { |
363 | /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\\n\");" $ */ | 360 | /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, Joshua MacDonald\\n\");" $ */ |
364 | XPR(NTR "Xdelta version 3.0.6, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n"); | 361 | XPR(NTR "Xdelta version 3.0.7, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Joshua MacDonald\n"); |
365 | XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); | 362 | XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); |
366 | XPR(NTR "This is free software, and you are welcome to redistribute it\n"); | 363 | XPR(NTR "This is free software, and you are welcome to redistribute it\n"); |
367 | XPR(NTR "under certain conditions; see \"COPYING\" for details.\n"); | 364 | 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 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta 3 - delta compression tools and library |
2 | * Copyright (C) 2002, 2003, 2006, 2007. Joshua P. MacDonald | 2 | * Copyright (C) 2002, 2003, 2006, 2007, 2013. Joshua P. MacDonald |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License as published by | 5 | * 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 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta 3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, | 2 | * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, |
3 | * 2008, 2009, 2010. Joshua P. MacDonald | 3 | * 2008, 2009, 2010, 2011, 2012, 2013. Joshua P. MacDonald |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * 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 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta 3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, | 2 | * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, |
3 | * 2008, 2009, 2010. Joshua P. MacDonald | 3 | * 2008, 2009, 2010, 2011, 2012, 2013. Joshua P. MacDonald |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * 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 @@ | |||
9 | (Checkin-Login jmacd) | 9 | (Checkin-Login jmacd) |
10 | (Populate-Ignore ("\\.svn")) | 10 | (Populate-Ignore ("\\.svn")) |
11 | (Project-Keywords | 11 | (Project-Keywords |
12 | (Xdelta3Version "3.0.6") | 12 | (Xdelta3Version "3.0.7") |
13 | ) | 13 | ) |
14 | (Files | 14 | (Files |
15 | (COPYING (xdelta3/b/29_COPYING 1.1 744)) | 15 | (COPYING (xdelta3/b/29_COPYING 1.1 744)) |