[Pkg-octave-commit] [octave-interval] 01/01: d/rules: Fix package build error

[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 11ffd3e0b2c630d010e7c3f7e6abd4464f225f28
Author: Oliver Heimlich <oheim at posteo.de>
Date:   Mon Jan 16 09:48:00 2017 +0100

    d/rules: Fix package build error
    
    * Undo revision f2e911ba31fc4032836e458f12c9a5389df73587
    * Don't rely on patches for the `clean' target
    * Move patched `clean' target from src/Makefile to d/rules
---
 debian/changelog                    |  2 +-
 debian/patches/fix-make-clean.patch | 13 -------------
 debian/patches/series               |  1 -
 debian/rules                        |  3 ++-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a64809..e68f689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ octave-interval (2.1.0-1) unstable; urgency=medium
   * Imported Upstream version 2.1.0
   * d/copyright: reflect upstream changes
   * d/control: Add Multi-Arch tags
-  * d/p/fix-make-clean.patch: Fix package build error
+  * d/rules: Fix package build error
   * d/copyright: Update FSF's postal address
 
   [ Sébastien Villemot ]
diff --git a/debian/patches/fix-make-clean.patch b/debian/patches/fix-make-clean.patch
deleted file mode 100644
index 5255888..0000000
--- a/debian/patches/fix-make-clean.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: octave-interval/src/Makefile
-===================================================================
---- octave-interval.orig/src/Makefile
-+++ octave-interval/src/Makefile
-@@ -56,7 +56,7 @@ __setround__.oct: __setround__.cc
- 	$(MKOCTFILE)  -o $@  $<
- 
- clean:
--	$(MAKE) -C crlibm $@
-+	test ! -e crlibm/Makefile || $(MAKE) -C crlibm $@
- 	$(RM) *.oct *.o
- 
- .PHONY: all clean
diff --git a/debian/patches/series b/debian/patches/series
index 4e71a4a..578de0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-external-css.patch
-fix-make-clean.patch
diff --git a/debian/rules b/debian/rules
index d4d4072..8926595 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,4 +44,5 @@ remove-dirs::
 
 clean::
 	make -C doc clean
-	make -C src clean
+	test ! -e src/crlibm/Makefile || make -C src/crlibm maintainer-clean
+	rm -f src/*.oct src/*.o

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