[ode] 01/03: Merging patches

[Leopold Palomo-Avellaneda]

This is an automated email from the git hooks/post-receive script.

lepalom-guest pushed a commit to branch master
in repository ode.

commit 8b0d39ce60ca10f3811352807c8b3d367b04e14f
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Tue Oct 13 23:12:37 2015 +0200

    Merging patches
---
 .../0001-Patch-to-solve-autoreconf-issue.patch     | 35 ----------------------
 ...01-Patch-to-solve-autoreconf-libccd-issue.patch | 32 ++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/debian/patches/0001-Patch-to-solve-autoreconf-issue.patch b/debian/patches/0001-Patch-to-solve-autoreconf-issue.patch
deleted file mode 100644
index e4c57db..0000000
--- a/debian/patches/0001-Patch-to-solve-autoreconf-issue.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
-Date: Tue, 13 Oct 2015 15:02:53 +0200
-Subject: Patch to solve autoreconf issue
-
----
- configure.ac        | 2 +-
- libccd/configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a606561..2178c49 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -452,7 +452,7 @@ then
-     fi
- fi
- 
--AC_CONFIG_SUBDIRS([libccd])
-+#AC_CONFIG_SUBDIRS([libccd])
- 
- AM_CONDITIONAL(LIBCCD, test x$use_libccd != xno)
- AM_CONDITIONAL(LIBCCD_INTERNAL, test x$libccd_source = xinternal)
-diff --git a/libccd/configure.ac b/libccd/configure.ac
-index 7e86a8c..5a12836 100644
---- a/libccd/configure.ac
-+++ b/libccd/configure.ac
-@@ -5,7 +5,7 @@
- AC_INIT([libccd], [1.0], [danfis at danfis.cz])
- AC_CONFIG_SRCDIR([src/ccd.c])
- AC_CONFIG_HEADERS([src/config.h])
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE(foreign)
- 
- # Checks for programs.
- AC_PROG_CXX
diff --git a/debian/patches/0001-Patch-to-solve-autoreconf-libccd-issue.patch b/debian/patches/0001-Patch-to-solve-autoreconf-libccd-issue.patch
new file mode 100644
index 0000000..aa335dc
--- /dev/null
+++ b/debian/patches/0001-Patch-to-solve-autoreconf-libccd-issue.patch
@@ -0,0 +1,32 @@
+diff -u b/configure.ac b/configure.ac
+--- b/configure.ac
++++ b/configure.ac
+@@ -452,8 +452,14 @@
+     fi
+ fi
+ 
+-AC_CONFIG_SUBDIRS([libccd])
+-
++if test x$use_libccd = xyes
++then
++     if test x$libccd_source = xinternal
++     then
++        AC_CONFIG_SUBDIRS([libccd])
++     fi
++fi
++ 
+ AM_CONDITIONAL(LIBCCD, test x$use_libccd != xno)
+ AM_CONDITIONAL(LIBCCD_INTERNAL, test x$libccd_source = xinternal)
+ AM_CONDITIONAL(LIBCCD_BOX_CYL,          test x$col_box_cylinder = xlibccd)
+unchanged:
+--- a/libccd/configure.ac
++++ b/libccd/configure.ac
+@@ -5,7 +5,7 @@
+ AC_INIT([libccd], [1.0], [danfis at danfis.cz])
+ AC_CONFIG_SRCDIR([src/ccd.c])
+ AC_CONFIG_HEADERS([src/config.h])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE(foreign)
+ 
+ # Checks for programs.
+ AC_PROG_CXX
diff --git a/debian/patches/series b/debian/patches/series
index 8958619..2f35a15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Patch-to-solve-autoreconf-issue.patch
+0001-Patch-to-solve-autoreconf-libccd-issue.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ode.git