[Pkg-ocaml-maint-commits] [ocamlnet] 06/10: Fix upstream distclean target

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocamlnet.

commit e8ac1259e8f0fe50f30d771c7f215ab682f2d5ea
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 11 10:51:31 2016 +0200

    Fix upstream distclean target
---
 debian/patches/0007-Fix-distclean-target.patch | 60 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 61 insertions(+)

diff --git a/debian/patches/0007-Fix-distclean-target.patch b/debian/patches/0007-Fix-distclean-target.patch
new file mode 100644
index 0000000..70f08dc
--- /dev/null
+++ b/debian/patches/0007-Fix-distclean-target.patch
@@ -0,0 +1,60 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 11 Aug 2016 10:51:07 +0200
+Subject: Fix distclean target
+
+---
+ Makefile                       | 2 +-
+ src/netsys/Makefile.pre        | 1 +
+ src/nettls-gnutls/Makefile.pre | 6 +++++-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 070f6c3..fae21f8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -90,12 +90,12 @@ CLEAN: clean
+ 
+ .PHONY: distclean
+ distclean:
+-	rm -f Makefile.conf 
+ 	rm -rf tmp
+ 	for pkg in src/*/.; do \
+ 		test ! -f $$pkg/Makefile || \
+ 			( cd $$pkg && $(MAKE) -f Makefile.pre distclean); \
+ 	done
++	rm -f Makefile.conf config.cppo setup.save
+ 
+ # That one is for oasis
+ 
+diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
+index c753f6f..471a519 100644
+--- a/src/netsys/Makefile.pre
++++ b/src/netsys/Makefile.pre
+@@ -22,5 +22,6 @@ distclean::
+ 	rm -f Makefile.conf config.h
+ 	rm -f configtests/*.cmi configtests/*.cmo configtests/*.o
+ 	rm -f configtests/*.err configtests/*.tmp configtests/*.cm*
++	rm -f configtests/mkfifoat_test
+ 	find configtests -type f -executable -delete
+ 	rm -rf tmp
+diff --git a/src/nettls-gnutls/Makefile.pre b/src/nettls-gnutls/Makefile.pre
+index 4e6b308..2cd842b 100644
+--- a/src/nettls-gnutls/Makefile.pre
++++ b/src/nettls-gnutls/Makefile.pre
+@@ -20,6 +20,9 @@ CLEAN_LIST += nettls_gnutls_bindings.ml \
+               nettls_nettle_bindings_stubs.c \
+ 	      nettls_gnutls_config.ml \
+               config.log \
++              config.h \
++              config.mk \
++              config.sh \
+               config_checks.sh \
+               done_reconfigure
+ 
+@@ -35,4 +38,5 @@ nettls_gnutls_bindings_stubs.c: done_reconfigure
+ done_reconfigure: gnutls.descr gnutls.c gnutls.ml gnutls.mli
+ 	./reconfigure
+ 
+-
++distclean::
++	rm -rf testdir
diff --git a/debian/patches/series b/debian/patches/series
index 81c90fa..53a382f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Force-major-version-for-apache-to-2.patch
 0005-Fix-upstream-cleaning-rules.patch
 0006-Fix-compilation-of-Apache-module.patch
+0007-Fix-distclean-target.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git