[Pkg-octave-commit] [octave] 05/15: Refresh other patches.
Sébastien Villemot
sebastien at moszumanska.debian.org
Wed Dec 11 13:32:52 UTC 2013
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository octave.
commit 7ce62662a1ca35e80e40e8b93e90733e5662132b
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Dec 10 17:11:57 2013 +0100
Refresh other patches.
---
debian/patches/add_info_dir_categories | 14 +------
.../drop_version_from_mkoctfile_function_call | 10 ++---
.../patches/drop_version_from_pkg_function_calls | 17 ++++-----
debian/patches/drop_versioned_binarys | 8 ++--
debian/patches/enable_dirs_in_pkg | 6 +--
debian/patches/install_libraries_publically | 43 ++++++----------------
debian/patches/mkoctfile-mpi.diff | 4 +-
debian/patches/no_pdf_in_print.diff | 6 +--
8 files changed, 38 insertions(+), 70 deletions(-)
diff --git a/debian/patches/add_info_dir_categories b/debian/patches/add_info_dir_categories
index 68920c9..2444326 100644
--- a/debian/patches/add_info_dir_categories
+++ b/debian/patches/add_info_dir_categories
@@ -1,20 +1,10 @@
Description: Add categories to the static info files generated by the texi files.
Forwarded: not yet
Author: Thomas Weber <tweber at debian.org>
---- a/doc/faq/OctaveFAQ.texi
-+++ b/doc/faq/OctaveFAQ.texi
-@@ -22,6 +22,7 @@
- @settitle Frequently asked questions about Octave (with answers)
-
- @setchapternewpage off
-+ at dircategory Math
- @direntry
- * OctaveFAQ: (OctaveFAQ). Frequently asked questions about Octave
- @end direntry
--- a/doc/interpreter/octave.texi
+++ b/doc/interpreter/octave.texi
-@@ -61,6 +61,7 @@
- @end ifnotinfo
+@@ -23,6 +23,7 @@
+ @include macros.texi
@ifinfo
+ at dircategory Math
diff --git a/debian/patches/drop_version_from_mkoctfile_function_call b/debian/patches/drop_version_from_mkoctfile_function_call
index 3310dd5..9e6f874 100644
--- a/debian/patches/drop_version_from_mkoctfile_function_call
+++ b/debian/patches/drop_version_from_mkoctfile_function_call
@@ -3,12 +3,12 @@ Forwarded: not-needed
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
--- a/scripts/miscellaneous/mkoctfile.m
+++ b/scripts/miscellaneous/mkoctfile.m
-@@ -144,7 +144,7 @@
-
+@@ -145,7 +145,7 @@
bindir = octave_config_info ("bindir");
+ ext = octave_config_info ("EXEEXT");
-- shell_script = fullfile (bindir, sprintf ("mkoctfile-%s", OCTAVE_VERSION));
+- shell_script = fullfile (bindir, sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext));
+ shell_script = fullfile (bindir, "mkoctfile");
- cmd = cstrcat ("\"", shell_script, "\"");
- for i = 1:nargin
+ if (! exist (shell_script, "file"))
+ __gripe_missing_component__ ("mkoctfile", "mkoctfile");
diff --git a/debian/patches/drop_version_from_pkg_function_calls b/debian/patches/drop_version_from_pkg_function_calls
index 810f5fe..2dc48c8 100644
--- a/debian/patches/drop_version_from_pkg_function_calls
+++ b/debian/patches/drop_version_from_pkg_function_calls
@@ -1,16 +1,15 @@
Description: Call the octave binaries by their name without version
Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
---- a/scripts/pkg/pkg.m
-+++ b/scripts/pkg/pkg.m
-@@ -1341,10 +1341,9 @@
- if (exist (fullfile (packdir, "src"), "dir"))
- src = fullfile (packdir, "src");
+--- a/scripts/pkg/private/configure_make.m
++++ b/scripts/pkg/private/configure_make.m
+@@ -29,9 +29,9 @@
octave_bindir = octave_config_info ("bindir");
-- ver = version ();
-- mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver));
-- octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s", ver));
-- octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver));
+ ver = version ();
+ ext = octave_config_info ("EXEEXT");
+- mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext));
+- octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext));
+- octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext));
+ mkoctfile_program = fullfile (octave_bindir, "mkoctfile");
+ octave_config_program = fullfile (octave_bindir, "octave-config");
+ octave_binary = fullfile (octave_bindir, "octave");
diff --git a/debian/patches/drop_versioned_binarys b/debian/patches/drop_versioned_binarys
index ffa3a63..51ddb76 100644
--- a/debian/patches/drop_versioned_binarys
+++ b/debian/patches/drop_versioned_binarys
@@ -4,12 +4,12 @@ Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -696,7 +696,7 @@
- chmod a+rx $@
- endif
+@@ -159,7 +159,7 @@
+ main.cc: main.in.cc Makefile
+ @$(do_subst_default_vals)
-install-exec-hook: make-version-links
+install-exec-hook:
- install-data-hook: install-oct
+ uninstall-local: remove-version-links
diff --git a/debian/patches/enable_dirs_in_pkg b/debian/patches/enable_dirs_in_pkg
index aa9869c..3a84955 100644
--- a/debian/patches/enable_dirs_in_pkg
+++ b/debian/patches/enable_dirs_in_pkg
@@ -1,9 +1,9 @@
Description: Allow installation of already extracted packages with pkg.m
Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
---- a/scripts/pkg/pkg.m
-+++ b/scripts/pkg/pkg.m
-@@ -701,25 +701,32 @@
+--- a/scripts/pkg/private/install.m
++++ b/scripts/pkg/private/install.m
+@@ -75,25 +75,32 @@
endif
## Uncompress the package.
diff --git a/debian/patches/install_libraries_publically b/debian/patches/install_libraries_publically
index 34792d4..6922577 100644
--- a/debian/patches/install_libraries_publically
+++ b/debian/patches/install_libraries_publically
@@ -5,48 +5,27 @@ Description: Install the Octave libraries publically in /usr/lib/
in the future.
Forwarded: not-needed
Author: Thomas Weber <tweber at debian.org>
---- a/libcruft/Makefile.am
-+++ b/libcruft/Makefile.am
-@@ -27,7 +27,8 @@
-
- AUTOMAKE_OPTIONS = subdir-objects
-
--octlib_LTLIBRARIES = libcruft.la
-+lib_LTLIBRARIES = libcruft.la
-+octlib_LTLIBRARIES =
-
- libcruft_la_SOURCES =
-
-@@ -59,7 +60,7 @@
- -bindir $(bindir) \
- $(LIBCRUFT_LINK_OPTS)
-
--libcruft_la_DEPENDENCIES = cruft.def
-+libcruft_la_DEPENDENCIES = cruft.def libranlib.la
-
- noinst_LTLIBRARIES = libranlib.la
-
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
-@@ -413,7 +413,8 @@
- uint64NDArray.cc \
- uint8NDArray.cc
+@@ -38,7 +38,8 @@
+
+ AM_CXXFLAGS += $(WARN_CXXFLAGS)
-octlib_LTLIBRARIES = liboctave.la
+lib_LTLIBRARIES = liboctave.la
+octlib_LTLIBRARIES =
- LIBOCTAVE_CXX_SOURCES = \
- CollocWt.cc \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,7 +30,8 @@
+ EXTRA_DIST =
+
+--- a/libinterp/Makefile.am
++++ b/libinterp/Makefile.am
+@@ -38,7 +38,8 @@
- AUTOMAKE_OPTIONS = subdir-objects
+ AM_CXXFLAGS += $(WARN_CXXFLAGS)
-octlib_LTLIBRARIES = liboctinterp.la
+lib_LTLIBRARIES = liboctinterp.la
+octlib_LTLIBRARIES =
- if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
- bin_PROGRAMS = \
+ ## Order matters here. Leave builtins.cc last, because it depends on
+ ## $(DEF_FILES), and building those requires all the sources
diff --git a/debian/patches/mkoctfile-mpi.diff b/debian/patches/mkoctfile-mpi.diff
index fd834a2..47d14be 100644
--- a/debian/patches/mkoctfile-mpi.diff
+++ b/debian/patches/mkoctfile-mpi.diff
@@ -5,8 +5,8 @@ Forwarded: not-needed
Last-Update: 2012-08-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/mkoctfile.in
-+++ b/src/mkoctfile.in
+--- a/src/mkoctfile.in.sh
++++ b/src/mkoctfile.in.sh
@@ -77,7 +77,7 @@
: ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
: ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
diff --git a/debian/patches/no_pdf_in_print.diff b/debian/patches/no_pdf_in_print.diff
index 352af59..cf2f587 100644
--- a/debian/patches/no_pdf_in_print.diff
+++ b/debian/patches/no_pdf_in_print.diff
@@ -3,9 +3,9 @@ missing pdflib (closes: #478677)
-- Thomas Weber <thomas.weber.mail at gmail.com> Sat, 24 May 2008 13:49:51 +0200
---- a/scripts/plot/print.m
-+++ b/scripts/plot/print.m
-@@ -141,6 +141,9 @@
+--- a/scripts/plot/util/print.m
++++ b/scripts/plot/util/print.m
+@@ -165,6 +165,9 @@
##
## @item pdf
## Portable document format
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git
More information about the Pkg-octave-commit
mailing list