[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.5-2-13-g5b221c3

Stephane Glondu steph at glondu.net
Fri Jul 12 10:36:27 UTC 2013 

The following commit has been merged in the master branch:
commit 74372b7b5d4c4e717fd1ae562ce2546f8e337e62
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 12 11:29:10 2013 +0200

    Switch patches to dom-save-patches format

diff --git a/debian/patches/01_postgresql_socket b/debian/patches/0001-Adapting-the-postgresql-socket-for-Debian-systems.patch
similarity index 60%
rename from debian/patches/01_postgresql_socket
rename to debian/patches/0001-Adapting-the-postgresql-socket-for-Debian-systems.patch
index 0da1988..9d38ce8 100644
--- a/debian/patches/01_postgresql_socket
+++ b/debian/patches/0001-Adapting-the-postgresql-socket-for-Debian-systems.patch
@@ -1,12 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_postgresql_socket.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## DP: Adapting the postgresql socket for Debian systems.
+From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+Date: Fri, 12 Jul 2013 11:26:27 +0200
+Subject: Adapting the postgresql socket for Debian systems
 
- at DPATCH@
+---
+ 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
-@@ -24,8 +24,8 @@
+@@ -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.
  
@@ -17,3 +21,4 @@
 +DEFAULT_UNIX_DOMAIN_SOCKET_DIR := /var/run/postgresql
  
  #WINDOWS := 1
+-- 
diff --git a/debian/patches/03_makefile_cmxs b/debian/patches/0002-Generation-installation-and-removal-of-shared-librar.patch
old mode 100755
new mode 100644
similarity index 73%
rename from debian/patches/03_makefile_cmxs
rename to debian/patches/0002-Generation-installation-and-removal-of-shared-librar.patch
index 03eca9f..a861c0b
--- a/debian/patches/03_makefile_cmxs
+++ b/debian/patches/0002-Generation-installation-and-removal-of-shared-librar.patch
@@ -1,13 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_makefile_cmxs.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## DP: Generation, installation and removal of shared library pgocaml.cmxs.
+From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+Date: Fri, 12 Jul 2013 11:27:03 +0200
+Subject: Generation, installation and removal of shared library pgocaml.cmxs
 
- at DPATCH@
-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 @@
+---
+ 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)
  
@@ -16,7 +19,7 @@ diff -urNad pgocaml~/Makefile pgocaml/Makefile
  
  test: test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) test_pgocaml$(EXECUTABLE_SUFFIX)
  
-@@ -99,6 +99,9 @@
+@@ -114,6 +114,9 @@ pgocaml.cma: $(OBJS)
  pgocaml.cmxa: $(XOBJS)
  	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -a -o $@ $^
  
@@ -26,7 +29,7 @@ diff -urNad pgocaml~/Makefile pgocaml/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 @@
+@@ -143,7 +146,7 @@ META:	META.in Makefile.config
  #
  
  clean:
@@ -35,7 +38,7 @@ diff -urNad pgocaml~/Makefile pgocaml/Makefile
  	test_pgocaml_lowlevel test_pgocaml pgocaml_prof
  
  #
-@@ -150,7 +153,7 @@
+@@ -167,7 +170,7 @@ endif
  #
  
  findlib_install:
@@ -44,3 +47,4 @@ diff -urNad pgocaml~/Makefile pgocaml/Makefile
  
  reinstall:
  	ocamlfind remove $(PACKAGE)
+-- 
diff --git a/debian/patches/04_makefile_byte b/debian/patches/0003-Compiling-targets-for-non-native-builds.patch
old mode 100755
new mode 100644
similarity index 60%
rename from debian/patches/04_makefile_byte
rename to debian/patches/0003-Compiling-targets-for-non-native-builds.patch
index 0d1e501..b9730dc
--- a/debian/patches/04_makefile_byte
+++ b/debian/patches/0003-Compiling-targets-for-non-native-builds.patch
@@ -1,13 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_makefile_byte.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## DP: Compiling targets for non-native builds.
+From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+Date: Fri, 12 Jul 2013 11:27:30 +0200
+Subject: Compiling targets for non-native builds
 
- at DPATCH@
-diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
---- pgocaml-1.3~/Makefile	2009-10-09 18:34:12.000000000 +0200
-+++ pgocaml-1.3/Makefile	2009-10-09 18:36:26.000000000 +0200
-@@ -62,6 +62,7 @@
+---
+ 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)
@@ -15,7 +18,7 @@ diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
  
  test: test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) test_pgocaml$(EXECUTABLE_SUFFIX)
  
-@@ -165,6 +166,12 @@
+@@ -182,6 +183,12 @@ install:
  	install -c -m 0644 *.cmi *.mli *.cmo *.cma *.cmxa *.a META \
  	  $(DESTDIR)$(OCAMLLIBDIR)/$(PACKAGE)
  
@@ -28,3 +31,4 @@ diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
  #
  # Distribution.
  #
+-- 
diff --git a/debian/patches/05_makefile_findlib b/debian/patches/0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch
similarity index 58%
rename from debian/patches/05_makefile_findlib
rename to debian/patches/0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch
index c9ab04b..d505559 100644
--- a/debian/patches/05_makefile_findlib
+++ b/debian/patches/0004-Findlib-is-needed-to-link-pgocaml-provided-binaries.patch
@@ -1,9 +1,16 @@
-Author: Mehdi Dogguy <mehdi at debian.org>
+From: Mehdi Dogguy <mehdi at 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 @@
+@@ -28,7 +28,7 @@ SED	:= sed
  FGREP	:= fgrep
  
  OCAMLCFLAGS	:= -g
@@ -12,3 +19,4 @@ Subject: Findlib is needed to link pgocaml provided binaries
  OCAMLCLIBS	:= -linkpkg
  
  OCAMLSYNTAX := -syntax camlp4o -package camlp4.macro
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index febe7a8..fd0cc98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01_postgresql_socket
-03_makefile_cmxs
-04_makefile_byte
-05_makefile_findlib
+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

More information about the Pkg-ocaml-maint-commits mailing list