[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. upstream/1.3-23-g36e3771

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit 36e3771d08f543d25440fd7a376f0b065cb56685
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Mon Jul 6 17:53:16 2009 +0200

    Moving the pgocaml.cmxs cleaning from rules to patched Makefile.

diff --git a/debian/patches/03_makefile_cmxs.dpatch b/debian/patches/03_makefile_cmxs.dpatch
index 2df14cb..03eca9f 100755
--- a/debian/patches/03_makefile_cmxs.dpatch
+++ b/debian/patches/03_makefile_cmxs.dpatch
@@ -1,13 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_makefile_cmxs.dpatch by  <yziquel at localhost>
+## 03_makefile_cmxs.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Generation, installation and removal of shared library pgocaml.cmxs.
 
 @DPATCH@
-diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
---- pgocaml-1.3~/Makefile	2009-06-16 15:06:32.000000000 +0200
-+++ pgocaml-1.3/Makefile	2009-06-16 15:21:37.000000000 +0200
+diff -urNad pgocaml~/Makefile pgocaml/Makefile
+--- pgocaml~/Makefile	2009-07-06 17:46:19.000000000 +0200
++++ pgocaml/Makefile	2009-07-06 17:47:16.000000000 +0200
 @@ -61,7 +61,7 @@
  OBJS	:= pGOCaml_config.cmo pGOCaml_generic.cmo pGOCaml.cmo
  XOBJS	:= $(OBJS:.cmo=.cmx)
@@ -27,6 +26,15 @@ diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
  pGOCaml_config.ml: pGOCaml_config.ml.in Makefile Makefile.config
  	< $< sed -e "s|@DEFAULT_UNIX_DOMAIN_SOCKET_DIR@|$(DEFAULT_UNIX_DOMAIN_SOCKET_DIR)|" > $@
  
+@@ -127,7 +130,7 @@
+ #
+ 
+ clean:
+-	rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *~ core .depend META \
++	rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.cmxs *.o *.a *.so *~ core .depend META \
+ 	test_pgocaml_lowlevel test_pgocaml pgocaml_prof
+ 
+ #
 @@ -150,7 +153,7 @@
  #
  
diff --git a/debian/rules b/debian/rules
index 8b5a2ad..d8721d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,3 @@ OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package extlib -package pcre -package csv -pac
 
 pre-build::
 	make depend
-
-clean::
-	rm -f pgocaml.cmxs

-- 
pgocaml packaging