[Pkg-octave-commit] [octave-interval] 02/03: d/patches/*: Discard superseded patches

[Oliver Heimlich]

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

oheim-guest pushed a commit to branch master
in repository octave-interval.

commit 8d58108a051b1f1c39dac1e611e6d4a48dd8bee7
Author: Oliver Heimlich <oheim at posteo.de>
Date:   Sat Aug 26 13:34:11 2017 +0200

    d/patches/*: Discard superseded patches
    
     * detect-sse2.patch: Upstream has implemented auto detection and
       allows overriding the value (from debian/rules)
     * fix-external-css.patch: Upstream bundles a local CSS w/o webfonts
---
 debian/patches/detect-sse2.patch      | 24 ---------------
 debian/patches/fix-external-css.patch | 56 -----------------------------------
 debian/patches/series                 |  2 --
 3 files changed, 82 deletions(-)

diff --git a/debian/patches/detect-sse2.patch b/debian/patches/detect-sse2.patch
deleted file mode 100644
index 9f8d49d..0000000
--- a/debian/patches/detect-sse2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 4f36196..17a9dfa 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -17,6 +17,10 @@ OBJ            = crlibm_function.oct \
- LDFLAGS_MPFR   =-lmpfr
- ## Use important flags in XTRA_CFLAGS for OpenMP (workaround for bug #45280)
- CFLAG_OPENMP   =$(findstring -fopenmp,$(shell $(MKOCTFILE) -p XTRA_CFLAGS))
-+HAS_SSE2       =$(findstring sse2,$(shell cat /proc/cpuinfo))
-+ifdef HAS_SSE2
-+CONF_FLAG_SSE2 ?=--enable-sse2
-+endif
- 
- all: $(OBJ)
- 
-@@ -37,7 +41,7 @@ crlibm_function.o: crlibm_function.cc
- crlibm/crlibm_private.o: crlibm/crlibm_config.h
- 	$(MAKE) -C crlibm CFLAGS+="$(shell $(MKOCTFILE) -p CPICFLAG) -Wno-div-by-zero -Wno-unused-variable -Wno-unused-but-set-variable"
- crlibm/crlibm_config.h:
--	(cd crlibm && ./configure --disable-dependency-tracking --enable-sse2)
-+	(cd crlibm && ./configure --disable-dependency-tracking $(CONF_FLAG_SSE2))
- 
- ## GNU MPFR api oct-files
- mpfr_matrix_mul_d.oct mpfr_matrix_sqr_d.oct : mpfr_%.oct: mpfr_%.cc mpfr_commons.cc
diff --git a/debian/patches/fix-external-css.patch b/debian/patches/fix-external-css.patch
deleted file mode 100644
index 73c439f..0000000
--- a/debian/patches/fix-external-css.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -17,7 +17,7 @@
- images: $(IMAGE_OBJ)
- 
- manual.html: manual.texinfo $(wildcard chapter/*) license/gpl-3.0.texi $(wildcard image/*.texinfo) $(IMAGE_OBJ)
--	$(MAKEINFO) -D 'version $(VERSION)' --html --no-split --css-ref='https://www.gnu.org/software/octave/doc/interpreter/octave.css' --css-include manual.css "$<"
-+	$(MAKEINFO) -D 'version $(VERSION)' --html --no-split --css-include=octave.css --css-include manual.css "$<"
- 
- manual.pdf: manual.texinfo $(wildcard chapter/*) license/gpl-3.0.texi $(wildcard image/*.texinfo) $(wildcard image/*.pdf) $(IMAGE_OBJ)
- 	$(MAKEINFO) --Xopt=--texinfo='@set version $(VERSION)' --pdf "$<"
---- /dev/null
-+++ b/doc/octave.css
-@@ -0,0 +1,42 @@
-+/*
-+Copyright (C) 2016 Oliver Heimlich
-+
-+This file is part of Octave.
-+
-+Octave is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the
-+Free Software Foundation; either version 3 of the License, or (at
-+your option) any later version.
-+
-+Octave is distributed in the hope that it will be useful, but WITHOUT
-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with Octave; see the file COPYING.  If not, see
-+<http://www.gnu.org/licenses/>.
-+*/
-+
-+body > * { max-width: 42em; }
-+div.header { max-width: 100%; }
-+hr { margin-left: 0; border: none; border-top: 3px double #657b83; }
-+div.header, div.float-caption { color: #657b83; }
-+ul, ol { max-width: 39.5em; padding-left: 2.5em; }
-+div.example, div.display, div.indentedblock, div.smalldisplay, div.lisp, div.smallindentedblock, div.smallexample, div.smalllisp { max-width: 38.8em; margin-left: 3.2em; }
-+blockquote { margin-left: 3.2em; margin-right: 3.2em; max-width: 35.6em; }
-+body, span.roman { font-family: sans-serif; }
-+body { padding-left: 7.5em; padding-right: 7.5em; }
-+h1, h2, h3, h4, h5, pre.menu-comment { font-family: serif; text-align: left !important; }
-+div.float table, img { margin-left: auto; margin-right: auto; }
-+div.float table { width: 38em; }
-+div.float table, div.float th { border-collapse: collapse; border-top: 1px solid black; border-bottom: 1px solid black; }
-+div.float th, div.float td { padding: 0.5em; }
-+dd > p:first-child { margin-top: 0; }
-+a { color: #268bd2; }
-+a:visited { color: #d33682; }
-+code, kbd, samp, tt { font-family: monospace; padding: 0 0.1em; font-style: italic; }
-+pre.example, pre.smallexample, pre.verbatim { font-family: monospace; }
-+pre.example { background-color: #fdf6e3; color: #657b83; padding: 0.5em; }
-+.example { margin-bottom: 1em; }
-+.example + .example { margin-top: -0.5em }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b6fc6a9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-external-css.patch
-detect-sse2.patch

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