From 2e4a3d62c6b9fe12b25f6a5d01256badbbe4df5a Mon Sep 17 00:00:00 2001 From: "josh.macdonald" Date: Sat, 18 Aug 2012 17:14:30 +0000 Subject: Prepare 3.0.4 --- xdelta3/Makefile.am | 1 + xdelta3/config.h.in | 7 ------- xdelta3/configure.ac | 6 +++--- xdelta3/ltmain.sh | 2 +- xdelta3/m4/ltversion.m4 | 2 +- xdelta3/xdelta3-main.h | 2 +- xdelta3/xdelta3.prj | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am index e5ee2e5..71b4dd4 100644 --- a/xdelta3/Makefile.am +++ b/xdelta3/Makefile.am @@ -11,6 +11,7 @@ common_SOURCES = \ xdelta3-hash.h \ xdelta3-internal.h \ xdelta3-list.h \ + xdelta3-lzma.h \ xdelta3-main.h \ xdelta3-merge.h \ xdelta3-second.h \ diff --git a/xdelta3/config.h.in b/xdelta3/config.h.in index 50345b3..220915d 100644 --- a/xdelta3/config.h.in +++ b/xdelta3/config.h.in @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -36,10 +33,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac index 70b733a..869f3c2 100644 --- a/xdelta3/configure.ac +++ b/xdelta3/configure.ac @@ -1,10 +1,10 @@ -AC_INIT([Xdelta3], [3.0.3], [josh.macdonald@gmail.com], +AC_INIT([Xdelta3], [3.0.4], [josh.macdonald@gmail.com], [xdelta3], [http://xdelta.org/]) AC_PREREQ([2.68]) AC_CONFIG_MACRO_DIR([m4]) -LT_INIT +#LT_INIT AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar]) -AC_DISABLE_STATIC +#AC_DISABLE_STATIC AC_PROG_CC AC_PROG_CXX AC_CHECK_HEADERS([lzma.h]) diff --git a/xdelta3/ltmain.sh b/xdelta3/ltmain.sh index 4159958..377d47b 120000 --- a/xdelta3/ltmain.sh +++ b/xdelta3/ltmain.sh @@ -1 +1 @@ -/usr/share/libtool/config/ltmain.sh \ No newline at end of file +/usr/local/share/libtool/config/ltmain.sh \ No newline at end of file diff --git a/xdelta3/m4/ltversion.m4 b/xdelta3/m4/ltversion.m4 index 5eb474f..f5bd471 120000 --- a/xdelta3/m4/ltversion.m4 +++ b/xdelta3/m4/ltversion.m4 @@ -1 +1 @@ -/usr/share/aclocal/ltversion.m4 \ No newline at end of file +/usr/local/share/aclocal/ltversion.m4 \ No newline at end of file diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index 7ab7c3e..dfac8b7 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h @@ -356,7 +356,7 @@ 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.3, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n"); + XPR(NTR "Xdelta version 3.0.4, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 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.prj b/xdelta3/xdelta3.prj index 28cc37e..f877753 100644 --- a/xdelta3/xdelta3.prj +++ b/xdelta3/xdelta3.prj @@ -9,7 +9,7 @@ (Checkin-Login jmacd) (Populate-Ignore ("\\.svn")) (Project-Keywords - (Xdelta3Version "3.0.3") + (Xdelta3Version "3.0.4") ) (Files (COPYING (xdelta3/b/29_COPYING 1.1 744)) -- cgit v1.2.3