summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjosh.macdonald <jmacd@users.noreply.github.com>2012-08-18 17:14:30 +0000
committerjosh.macdonald <jmacd@users.noreply.github.com>2012-08-18 17:14:30 +0000
commit2e4a3d62c6b9fe12b25f6a5d01256badbbe4df5a (patch)
tree265eceb55c57d673175dd4135c2e9b6770db2fe4
parentf1f956b4d86dad153f9cbb8eb87b04052c0fa96c (diff)
Prepare 3.0.4
-rw-r--r--xdelta3/Makefile.am1
-rw-r--r--xdelta3/config.h.in7
-rw-r--r--xdelta3/configure.ac6
l---------xdelta3/ltmain.sh2
l---------xdelta3/m4/ltversion.m42
-rw-r--r--xdelta3/xdelta3-main.h2
-rw-r--r--xdelta3/xdelta3.prj2
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 = \
11 xdelta3-hash.h \ 11 xdelta3-hash.h \
12 xdelta3-internal.h \ 12 xdelta3-internal.h \
13 xdelta3-list.h \ 13 xdelta3-list.h \
14 xdelta3-lzma.h \
14 xdelta3-main.h \ 15 xdelta3-main.h \
15 xdelta3-merge.h \ 16 xdelta3-merge.h \
16 xdelta3-second.h \ 17 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 @@
1/* config.h.in. Generated from configure.ac by autoheader. */ 1/* config.h.in. Generated from configure.ac by autoheader. */
2 2
3/* Define to 1 if you have the <dlfcn.h> header file. */
4#undef HAVE_DLFCN_H
5
6/* Define to 1 if you have the <inttypes.h> header file. */ 3/* Define to 1 if you have the <inttypes.h> header file. */
7#undef HAVE_INTTYPES_H 4#undef HAVE_INTTYPES_H
8 5
@@ -36,10 +33,6 @@
36/* Define to 1 if you have the <unistd.h> header file. */ 33/* Define to 1 if you have the <unistd.h> header file. */
37#undef HAVE_UNISTD_H 34#undef HAVE_UNISTD_H
38 35
39/* Define to the sub-directory in which libtool stores uninstalled libraries.
40 */
41#undef LT_OBJDIR
42
43/* Define to the address where bug reports for this package should be sent. */ 36/* Define to the address where bug reports for this package should be sent. */
44#undef PACKAGE_BUGREPORT 37#undef PACKAGE_BUGREPORT
45 38
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 @@
1AC_INIT([Xdelta3], [3.0.3], [josh.macdonald@gmail.com], 1AC_INIT([Xdelta3], [3.0.4], [josh.macdonald@gmail.com],
2 [xdelta3], [http://xdelta.org/]) 2 [xdelta3], [http://xdelta.org/])
3AC_PREREQ([2.68]) 3AC_PREREQ([2.68])
4AC_CONFIG_MACRO_DIR([m4]) 4AC_CONFIG_MACRO_DIR([m4])
5LT_INIT 5#LT_INIT
6AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar]) 6AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar])
7AC_DISABLE_STATIC 7#AC_DISABLE_STATIC
8AC_PROG_CC 8AC_PROG_CC
9AC_PROG_CXX 9AC_PROG_CXX
10AC_CHECK_HEADERS([lzma.h]) 10AC_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
356main_version (void) 356main_version (void)
357{ 357{
358 /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\\n\");" $ */ 358 /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\\n\");" $ */
359 XPR(NTR "Xdelta version 3.0.3, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n"); 359 XPR(NTR "Xdelta version 3.0.4, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n");
360 XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); 360 XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
361 XPR(NTR "This is free software, and you are welcome to redistribute it\n"); 361 XPR(NTR "This is free software, and you are welcome to redistribute it\n");
362 XPR(NTR "under certain conditions; see \"COPYING\" for details.\n"); 362 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 @@
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.3") 12 (Xdelta3Version "3.0.4")
13 ) 13 )
14(Files 14(Files
15 (COPYING (xdelta3/b/29_COPYING 1.1 744)) 15 (COPYING (xdelta3/b/29_COPYING 1.1 744))