[Pkg-ocaml-maint-commits] [SCM] ocaml-gnuplot packaging branch, master, updated. upstream/0.8.3-19-g95fa3c7

[Ralf Treinen]

The following commit has been merged in the master branch:
commit b483f9d81070976c18295660a5466da5241394b1
Author: Ralf Treinen <treinen at debian.org>
Date:   Thu Jan 26 15:51:06 2012 +0100

    make clean: do not kill all executables

diff --git a/debian/patches/make_clean b/debian/patches/make_clean
index ab7212b..2c3af79 100644
--- a/debian/patches/make_clean
+++ b/debian/patches/make_clean
@@ -1,16 +1,19 @@
 Author: Ralf Treinen <treinen at debian.org>
-Description: avoid bashism in clean target
+Description: avoid bashism in clean target, don't kill all executables
 
 Index: ocaml-gnuplot/Makefile
 ===================================================================
---- ocaml-gnuplot.orig/Makefile	2012-01-11 11:26:16.000000000 +0100
-+++ ocaml-gnuplot/Makefile	2012-01-26 15:17:22.000000000 +0100
-@@ -171,7 +171,7 @@
+--- ocaml-gnuplot.orig/Makefile	2012-01-26 15:19:27.000000000 +0100
++++ ocaml-gnuplot/Makefile	2012-01-26 15:48:28.000000000 +0100
+@@ -171,10 +171,9 @@
  
  .PHONY: clean dist-clean
  clean:
 -	@ rm -f *~ .*~ *.{o,a} *.cm[aiox] *.cmxa *.annot
-+	@ rm -f *~ .*~ *.[oa] *.cm[aiox] *.cmxa *.annot
++	@ rm -f *~ .*~ *.[oa] *.cm[aiox] *.cmxa *.annot *.exe
  	@ rm -f $(GENERATED_SOURCES0) $(GENERATED_SOURCES1)
  	@ rm -rf $(PKGNAME).html $(PKG_TARBALL)
- 	@ find . -type f -perm -u=x -exec rm -f {} \;
+-	@ find . -type f -perm -u=x -exec rm -f {} \;
+ 	@ if [ -d ./html ]; then rm -rf ./html; fi
+ 	cd demos; $(MAKE) clean
+ 

-- 
ocaml-gnuplot packaging