The following commit has been merged in the master branch:
commit bb2ed22ae93696488cb78ca31a0c8e53aefb8488
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Jul 12 11:35:39 2013 +0200

    Remove obsolete patches

diff --git 
a/debian/patches/0001-Adapting-the-postgresql-socket-for-Debian-systems.patch 
b/debian/patches/0001-Adapting-the-postgresql-socket-for-Debian-systems.patch
deleted file mode 100644
index 9d38ce8..0000000
--- 
a/debian/patches/0001-Adapting-the-postgresql-socket-for-Debian-systems.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Guillaume Yziquel <guillaume.yziq...@citycable.ch>
-Date: Fri, 12 Jul 2013 11:26:27 +0200
-Subject: Adapting the postgresql socket for Debian systems
-
----
- Makefile.config |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.config b/Makefile.config
-index 90af0d8..848f160 100644
---- a/Makefile.config
-+++ b/Makefile.config
-@@ -26,8 +26,8 @@ OCAMLLIBDIR := $(shell ocamlc -where)
- # Default location for Unix domain socket directory.  If the auto-detection
- # does not work on your system, please set this variable manually.
- 
--DEFAULT_UNIX_DOMAIN_SOCKET_DIR := $(if $(wildcard 
/var/run/postgresql),"/var/run/postgresql","/tmp")
-+#DEFAULT_UNIX_DOMAIN_SOCKET_DIR := $(if $(wildcard 
/var/run/postgresql),"/var/run/postgresql","/tmp")
- #DEFAULT_UNIX_DOMAIN_SOCKET_DIR := /tmp
--#DEFAULT_UNIX_DOMAIN_SOCKET_DIR := /var/run/postgresql
-+DEFAULT_UNIX_DOMAIN_SOCKET_DIR := /var/run/postgresql
- 
- #WINDOWS := 1
--- 
diff --git 
a/debian/patches/0002-Generation-installation-and-removal-of-shared-librar.patch
 
b/debian/patches/0002-Generation-installation-and-removal-of-shared-librar.patch
deleted file mode 100644
index a861c0b..0000000
--- 
a/debian/patches/0002-Generation-installation-and-removal-of-shared-librar.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Guillaume Yziquel <guillaume.yziq...@citycable.ch>
-Date: Fri, 12 Jul 2013 11:27:03 +0200
-Subject: Generation, installation and removal of shared library pgocaml.cmxs
-
----
- Makefile |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1c79cff..21affcd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -76,7 +76,7 @@ endif
- OBJS  := pGOCaml_config.cmo pGOCaml_generic.cmo pGOCaml.cmo
- XOBJS := $(OBJS:.cmo=.cmx)
- 
--all: META pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pa_pgsql.cmo 
pgocaml_prof$(EXECUTABLE_SUFFIX)
-+all: META pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pgocaml.cmxs 
pa_pgsql.cmo pgocaml_prof$(EXECUTABLE_SUFFIX)
- 
- test: test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) 
test_pgocaml$(EXECUTABLE_SUFFIX)
- 
-@@ -114,6 +114,9 @@ pgocaml.cma: $(OBJS)
- pgocaml.cmxa: $(XOBJS)
-       ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -a -o $@ $^
- 
-+pgocaml.cmxs: pgocaml.cmxa
-+      ocamlfind ocamlopt $(OCAMLOPTPACKAGES) -shared -linkall -o $@ $<
-+
- pGOCaml_config.ml: pGOCaml_config.ml.in Makefile Makefile.config
-       < $< sed -e 
"s|@DEFAULT_UNIX_DOMAIN_SOCKET_DIR@|$(DEFAULT_UNIX_DOMAIN_SOCKET_DIR)|" > $@
- 
-@@ -143,7 +146,7 @@ META:      META.in Makefile.config
- #
- 
- 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
- 
- #
-@@ -167,7 +170,7 @@ endif
- #
- 
- findlib_install:
--      ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa 
pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo pGOCaml_generic.mli 
pGOCaml.mli
-+      ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa 
pgocaml.cmxs pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo 
pGOCaml_generic.mli pGOCaml.mli
- 
- reinstall:
-       ocamlfind remove $(PACKAGE)
--- 
diff --git a/debian/patches/0003-Compiling-targets-for-non-native-builds.patch 
b/debian/patches/0003-Compiling-targets-for-non-native-builds.patch
deleted file mode 100644
index b9730dc..0000000
--- a/debian/patches/0003-Compiling-targets-for-non-native-builds.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Guillaume Yziquel <guillaume.yziq...@citycable.ch>
-Date: Fri, 12 Jul 2013 11:27:30 +0200
-Subject: Compiling targets for non-native builds
-
----
- Makefile |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 21affcd..cc9be24 100644
---- a/Makefile
-+++ b/Makefile
-@@ -77,6 +77,7 @@ OBJS := pGOCaml_config.cmo pGOCaml_generic.cmo pGOCaml.cmo
- XOBJS := $(OBJS:.cmo=.cmx)
- 
- all: META pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pgocaml.cmxs 
pa_pgsql.cmo pgocaml_prof$(EXECUTABLE_SUFFIX)
-+all_byte: META pGOCaml_config.ml pgocaml.cma pa_pgsql.cmo
- 
- test: test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) 
test_pgocaml$(EXECUTABLE_SUFFIX)
- 
-@@ -182,6 +183,12 @@ install:
-       install -c -m 0644 *.cmi *.mli *.cmo *.cma *.cmxa *.a META \
-         $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
- 
-+install_byte:
-+      rm -rf $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
-+      install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
-+      install -c -m 0644 *.cmi *.mli *.cmo *.cma META \
-+        $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
-+
- #
- # Distribution.
- #
--- 
diff --git 
a/debian/patches/0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch 
b/debian/patches/0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch
deleted file mode 100644
index d505559..0000000
--- 
a/debian/patches/0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Fri, 12 Jul 2013 11:27:56 +0200
-Subject: Findlib is needed to link pgocaml provided binaries
-
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index cc9be24..4b1a8f7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ SED  := sed
- FGREP := fgrep
- 
- OCAMLCFLAGS   := -g
--OCAMLCPACKAGES        := -package unix,$(EXTLIB),pcre,calendar,csv
-+OCAMLCPACKAGES        := -package unix,$(EXTLIB),pcre,calendar,csv,findlib
- OCAMLCLIBS    := -linkpkg
- 
- OCAMLSYNTAX := -syntax camlp4o -package camlp4.macro
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fd0cc98..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-Adapting-the-postgresql-socket-for-Debian-systems.patch
-0002-Generation-installation-and-removal-of-shared-librar.patch
-0003-Compiling-targets-for-non-native-builds.patch
-0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch

-- 
pgocaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to