[Pkg-octave-commit] [SCM] Debian packaging for octave-geometry branch, master, updated. debian/1.6.0-1-5-gc7d9fe2

Rafael Laboissiere rafael at laboissiere.net
Sat Apr 20 22:21:41 UTC 2013


The following commit has been merged in the master branch:
commit c7d9fe2a9b40dbebb282a7473ad38168d188dc24
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Apr 21 00:20:23 2013 +0200

    Drop patch install-oct-file.patch (applied upstream)

diff --git a/debian/patches/install-oct-file.patch b/debian/patches/install-oct-file.patch
deleted file mode 100644
index 737a8a8..0000000
--- a/debian/patches/install-oct-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Ensure that file _oc_polybool.oct is installed
- It seems that only the compiled *.oct that are present in the src/
- directory get installed in the architecture-dependent directory of the
- package.  This patch just move the _oc_polybool.oct file, which is built
- in src/octclip/, into src/.
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: http://sourceforge.net/mailarchive/forum.php?thread_name=20121015075653.GF26194%40laboissiere.net&forum_name=octave-dev
-Last-Update: 2012-10-15
-
---- octave-geometry-1.6.0.orig/src/octclip/Makefile
-+++ octave-geometry-1.6.0/src/octclip/Makefile
-@@ -15,6 +15,7 @@ FLAGS = -Wall -Wextra
- 	$(MKOCTFILE) $< $(CLIPOBJECT) $(FLAGS) -v  -I.
- 
- all: _oc_polybool.oct
-+	cp _oc_polybool.oct ..
- 
- clean:
- 	rm -rf *.o *~
diff --git a/debian/patches/series b/debian/patches/series
index e94ec38..0ed9383 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-install-oct-file.patch
 autoload-yes.patch

-- 
Debian packaging for octave-geometry



More information about the Pkg-octave-commit mailing list