[Pkg-octave-commit] [octave-specfun] 04/05: Remove functions which are now in Octave core

[Rafael Laboissière]

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

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

commit 32f1b9c79aa774a51b7e0339d1330ed18d3b10bb
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Sep 21 06:32:44 2014 -0300

    Remove functions which are now in Octave core
    
    Closes: #741036
---
 debian/control                           |  4 ++--
 debian/patches/do-not-build-ellipj.patch | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  7 +++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 405de92..46ac9e9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-octave/octave-specfun.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave-specfun.git
 
 Package: octave-specfun
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
+Architecture: all
+Depends: ${misc:Depends}, ${octave:Depends}
 Description: special mathematical functions for Octave
  This package provides special mathematical functions for octave,
  including elliptic functions, sine integral, exponential integrals, Dirac
diff --git a/debian/patches/do-not-build-ellipj.patch b/debian/patches/do-not-build-ellipj.patch
new file mode 100644
index 0000000..fd804cf
--- /dev/null
+++ b/debian/patches/do-not-build-ellipj.patch
@@ -0,0 +1,16 @@
+Description: Do not build ellipj.oct, which is in Octave core
+ This makes the package arch-indep.
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Bug-Debian: http://bugs.debian.org/741036
+Forwarded: not-needed
+Last-Update: 2014-09-21
+
+--- octave-specfun-1.1.0.orig/src/Makefile
++++ octave-specfun-1.1.0/src/Makefile
+@@ -1,6 +0,0 @@
+-all: ellipj.oct
+-
+-%.oct: %.cc
+-	mkoctfile -s $<
+-
+-clean: ; -rm *.o core octave-core *.oct *~
diff --git a/debian/patches/series b/debian/patches/series
index ce617fa..a79f91e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 autoload-yes
+do-not-build-ellipj.patch
diff --git a/debian/rules b/debian/rules
index 71fb86c..aefd680 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,10 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
+
+PKG := octave-specfun
+INSTDIR := $(CURDIR)/debian/$(PKG)
+install/$(PKG)::
+	for i in ellipke.m erfcinv.m expint.m ; do	\
+		rm -f $$(find $(INSTDIR)/ -name $$i) ;	\
+	done

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