[Pkg-octave-commit] [octave] 04/10: d/p/install_libraries_publically: Refresh for new upstream version

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch experimental
in repository octave.

commit 1c1a103374dd5a370c6d502c09715b23b88de3a9
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue Jul 5 03:16:38 2016 -0300

    d/p/install_libraries_publically: Refresh for new upstream version
---
 debian/patches/install_libraries_publically | 44 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/debian/patches/install_libraries_publically b/debian/patches/install_libraries_publically
index d77d205..a1bf453 100644
--- a/debian/patches/install_libraries_publically
+++ b/debian/patches/install_libraries_publically
@@ -7,27 +7,37 @@ Forwarded: not-needed
 Author: Thomas Weber <tweber at debian.org>
 Reviewed-by: Rafael Laboissiere <rafael at debian.org>
 Last-Update: 2016-07-03
---- a/liboctave/Makefile.am
-+++ b/liboctave/Makefile.am
-@@ -34,7 +34,8 @@
+--- a/libinterp/module.mk
++++ b/libinterp/module.mk
+@@ -27,7 +27,7 @@ libinterp_liboctinterp_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
  
- AM_CXXFLAGS += $(WARN_CXXFLAGS)
+ libinterp_liboctinterp_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
  
--octlib_LTLIBRARIES = liboctave.la
-+lib_LTLIBRARIES = liboctave.la
-+octlib_LTLIBRARIES =
+-octlib_LTLIBRARIES += libinterp/liboctinterp.la
++lib_LTLIBRARIES += libinterp/liboctinterp.la
  
- EXTRA_DIST =
+ BUILT_SOURCES += \
+   libinterp/builtin-defun-decls.h \
+diff --git a/liboctave/module.mk b/liboctave/module.mk
+index 5a08652..07727fc 100644
+--- a/liboctave/module.mk
++++ b/liboctave/module.mk
+@@ -22,7 +22,7 @@ liboctave_liboctave_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
  
---- a/libinterp/Makefile.am
-+++ b/libinterp/Makefile.am
-@@ -40,7 +40,8 @@
+ liboctave_liboctave_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
  
- AM_CXXFLAGS += $(WARN_CXXFLAGS)
+-octlib_LTLIBRARIES += liboctave/liboctave.la
++lib_LTLIBRARIES += liboctave/liboctave.la
  
--octlib_LTLIBRARIES = liboctinterp.la
-+lib_LTLIBRARIES = liboctinterp.la
-+octlib_LTLIBRARIES =
+ BUILT_INCS = \
+   $(BUILT_LIBOCTAVE_OPERATORS_INC) \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -207,6 +207,7 @@ OCTAVE_CROSS_TOOLS =
+ OCTAVE_INTERPRETER_TARGETS =
  
- ## This is the subset of $(BUILT_SOURCES) that may be included by source
- ## files that are preprocessed to make $(DEF_FILES).  This ensures that
+ octlib_LTLIBRARIES =
++lib_LTLIBRARIES =
+ noinst_LTLIBRARIES =
+ 
+ octinclude_HEADERS =

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git