[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 288a2068dddedabc7b5186f57e45a603775b645f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 7 13:30:53 2013 +0200

    Fix upstream cleaning rules

diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 2879744..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,13 +0,0 @@
-src/netcgi2-apache/netcgi_apache_mod.cds
-src/netsys/configtests/atfunctions
-src/netsys/configtests/fchdir
-src/netsys/configtests/fdopendir
-src/netsys/configtests/ocaml_fancy_page_tables
-src/netsys/configtests/posix_fadvise
-src/netsys/configtests/posix_fadvise.tmp
-src/netsys/configtests/posix_fallocate
-src/netsys/configtests/posix_fallocate.tmp
-src/netsys/configtests/posix_memalign
-src/netsys/configtests/posix_pthread
-src/netsys/configtests/posix_sem
-src/netsys/configtests/syslog
diff --git a/debian/patches/Fix-upstream-cleaning-rules.patch b/debian/patches/Fix-upstream-cleaning-rules.patch
new file mode 100644
index 0000000..f7ef599
--- /dev/null
+++ b/debian/patches/Fix-upstream-cleaning-rules.patch
@@ -0,0 +1,64 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 7 May 2013 13:54:27 +0200
+Subject: Fix upstream cleaning rules
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/netcgi2-apache/Makefile.pre |    5 ++---
+ src/netsys/Makefile             |    5 +++--
+ src/netsys/Makefile.pre         |    4 +++-
+ src/rpc-auth-local/Makefile.pre |    3 +++
+ 4 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/netcgi2-apache/Makefile.pre b/src/netcgi2-apache/Makefile.pre
+index ec90910..b39a595 100644
+--- a/src/netcgi2-apache/Makefile.pre
++++ b/src/netcgi2-apache/Makefile.pre
+@@ -33,6 +33,5 @@ include $(TOP_DIR)/Makefile.rules
+ CLEAN_LIST += $(wildcard *.so) $(wildcard *.lo) $(wildcard *.slo) \
+   $(wildcard *.la) config.h netcgi_apache_mod.ml 500netcgi_apache.info
+ 
+-clean::
+-	test -d .libs && $(RM) -rf .libs/
+-
++distclean::
++	$(RM) -rf .libs/ *.cds
+diff --git a/src/netsys/Makefile b/src/netsys/Makefile
+index 452aab2..8cf7994 100644
+--- a/src/netsys/Makefile
++++ b/src/netsys/Makefile
+@@ -98,7 +98,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+ 
+ 
+ clean::
+-	rm -f configtests/*.o configtests/*.err
+-	rm -f configtests/posix_shm
++	rm -f configtests/*.o configtests/*.err configtests/*.tmp configtests/*.cm*
++	find configtests -type f -executable -delete
++	rm -rf tmp
+ 
+ include depend
+diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
+index e00996e..cf340c3 100644
+--- a/src/netsys/Makefile.pre
++++ b/src/netsys/Makefile.pre
+@@ -17,4 +17,6 @@ include $(TOP_DIR)/Makefile.rules
+ distclean::
+ 	rm -f Makefile.conf config.h
+ 	rm -f configtests/*.cmi configtests/*.cmo configtests/*.o
+-	rm -f configtests/*.err configtests/posix_shm
++	rm -f configtests/*.err configtests/*.tmp configtests/*.cm*
++	find configtests -type f -executable -delete
++	rm -rf tmp
+diff --git a/src/rpc-auth-local/Makefile.pre b/src/rpc-auth-local/Makefile.pre
+index 29c1606..cd6e8fc 100644
+--- a/src/rpc-auth-local/Makefile.pre
++++ b/src/rpc-auth-local/Makefile.pre
+@@ -5,3 +5,6 @@ PKGNAME = rpc-auth-local
+ GENERATE = META
+ 
+ include $(TOP_DIR)/Makefile.rules
++
++distclean::
++	rm -f config.h configtests/*.err configtests/*.o configtests/*.cm*
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c146caa..ddf7eea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Avoid-shipping-GPL-license-text.patch
 Create-installation-directories.patch
 Do-not-install-apache.info-file.patch
 Force-major-version-for-apache-to-2.patch
+Fix-upstream-cleaning-rules.patch
diff --git a/debian/rules b/debian/rules
index 04a423f..08fca02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,11 +34,6 @@ override_dh_auto_build:
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(DESTDIR)
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -Rf src/netcgi2-apache/.libs/
-
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing -X.so.owner

-- 
ocamlnet packaging