[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2

Thomas Weber tweber at debian.org
Wed Dec 7 17:56:16 UTC 2011


The following commit has been merged in the master branch:
commit f84e4602db1c831d94924dc4483fcb39d0322314
Author: Thomas Weber <tweber at debian.org>
Date:   Tue Nov 15 19:32:49 2011 +0100

    New patch: install_libraries_publically

diff --git a/debian/patches/install_libraries_publically b/debian/patches/install_libraries_publically
new file mode 100644
index 0000000..463c415
--- /dev/null
+++ b/debian/patches/install_libraries_publically
@@ -0,0 +1,52 @@
+Description: Install the Octave libraries publically in /usr/lib/
+ Thanks to John Eaton for helping with this.
+ .
+ The patch is currently not needed upstream, but forwarding it might make sense
+ in the future.
+Forwarded: not-needed
+Author: Thomas Weber <tweber at debian.org>
+--- a/libcruft/Makefile.am
++++ b/libcruft/Makefile.am
+@@ -24,7 +24,8 @@
+ 
+ AUTOMAKE_OPTIONS = subdir-objects
+ 
+-octlib_LTLIBRARIES = libcruft.la
++lib_LTLIBRARIES = libcruft.la
++octlib_LTLIBRARIES =
+ 
+ libcruft_la_SOURCES =
+ 
+@@ -54,7 +55,7 @@
+   $(LAPACK_LIBS) $(BLAS_LIBS) \
+   $(FLIBS)
+ 
+-libcruft_la_DEPENDENCIES = cruft.def
++libcruft_la_DEPENDENCIES = cruft.def libranlib.la
+ 
+ noinst_LTLIBRARIES = libranlib.la
+ 
+--- a/liboctave/Makefile.am
++++ b/liboctave/Makefile.am
+@@ -408,7 +408,8 @@
+   uint64NDArray.cc \
+   uint8NDArray.cc
+ 
+-octlib_LTLIBRARIES = liboctave.la
++lib_LTLIBRARIES = liboctave.la
++octlib_LTLIBRARIES =
+ 
+ LIBOCTAVE_CXX_SOURCES = \
+   CollocWt.cc \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,7 +28,8 @@
+ 
+ AUTOMAKE_OPTIONS = subdir-objects
+ 
+-octlib_LTLIBRARIES = liboctinterp.la
++lib_LTLIBRARIES = liboctinterp.la
++octlib_LTLIBRARIES =
+ 
+ if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
+ bin_PROGRAMS = \
diff --git a/debian/patches/series b/debian/patches/series
index aba696e..8f0744f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 drop_version_from_pkg_function_calls
 enable_dirs_in_pkg
 drop_versioned_binarys
+install_libraries_publically

-- 
Debian packaging for octave



More information about the Pkg-octave-commit mailing list