This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cothreads.
commit 10af8da72a3e15677c3ee5ba68912f5fddf9d9eb Author: Stephane Glondu <st...@glondu.net> Date: Thu Jul 27 06:22:05 2017 +0200 Switch source package format to 3.0 (quilt) --- debian/control | 1 - ...-bunch-of-minor-fixes-from-cothreads-SVN.patch} | 40 ++++++++------ ...efile.template-to-fix-make-install-target.patch | 19 +++++++ ...> 0003-Corrects-documentation-generation.patch} | 22 ++++---- ...-install-native-files-on-non-native-arch.patch} | 64 +++++++++++++--------- .../0005-Corrects-Makefile.template-path.patch | 18 ++++++ debian/patches/00list | 5 -- debian/patches/20_makefile_destdir.dpatch | 17 ------ debian/patches/50_makefile_example.dpatch | 16 ------ debian/patches/series | 5 ++ debian/rules | 1 - debian/source/format | 1 + debian/source/local-options | 2 + 13 files changed, 117 insertions(+), 94 deletions(-) diff --git a/debian/control b/debian/control index ce76d43..35929f0 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), - dpatch, ocaml-nox (>= 3.11.1-3~), dh-ocaml (>= 0.9.1) Standards-Version: 3.8.3 diff --git a/debian/patches/10_patch_from_svn.dpatch b/debian/patches/0001-Pull-a-bunch-of-minor-fixes-from-cothreads-SVN.patch old mode 100755 new mode 100644 similarity index 76% rename from debian/patches/10_patch_from_svn.dpatch rename to debian/patches/0001-Pull-a-bunch-of-minor-fixes-from-cothreads-SVN.patch index 39d36cf..661df97 --- a/debian/patches/10_patch_from_svn.dpatch +++ b/debian/patches/0001-Pull-a-bunch-of-minor-fixes-from-cothreads-SVN.patch @@ -1,13 +1,17 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## patch_from_svn.dpatch by Erik de Castro Lopo <er...@mega-nerd.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Pull a bunch of minor fixes from cothreads SVN. +From: Erik de Castro Lopo <er...@mega-nerd.com> +Date: Thu, 27 Jul 2017 06:18:33 +0200 +Subject: Pull a bunch of minor fixes from cothreads SVN -@DPATCH@ -diff -ru cothreads/example/Makefile cothreads-svn/example/Makefile ---- cothreads/example/Makefile 2007-09-12 06:32:40.000000000 +1000 -+++ cothreads-svn/example/Makefile 2007-09-21 12:36:08.000000000 +1000 +--- + example/Makefile | 16 +++++++--------- + example/README | 14 +++++++++++--- + example/santa.ml | 2 +- + 3 files changed, 19 insertions(+), 13 deletions(-) + +diff --git a/example/Makefile b/example/Makefile +index edf2f98..a455322 100644 +--- a/example/Makefile ++++ b/example/Makefile @@ -1,35 +1,33 @@ include ../Makefile.template @@ -51,9 +55,10 @@ diff -ru cothreads/example/Makefile cothreads-svn/example/Makefile # TODO: # NETWPARAM = -I +networker $(IFRAY) unix.cma cothreads.cma # NETWOPTPARAM = $(NETWOPTPARAM:%.cma=%.cmxa) -diff -ru cothreads/example/README cothreads-svn/example/README ---- cothreads/example/README 2007-09-18 22:38:58.000000000 +1000 -+++ cothreads-svn/example/README 2007-09-21 12:36:07.000000000 +1000 +diff --git a/example/README b/example/README +index 19e5e6e..3b6d075 100644 +--- a/example/README ++++ b/example/README @@ -3,7 +3,12 @@ == BUILD == @@ -68,7 +73,7 @@ diff -ru cothreads/example/README cothreads-svn/example/README Type ''make clean'' to remove all imtermediate and final building results. -@@ -62,8 +67,11 @@ +@@ -62,8 +67,11 @@ Type ''make clean'' to remove all imtermediate and final building results. * The Makefile itself is an example. It shows that how you can build your applications against a set of execution engines with just a few lines of @@ -82,10 +87,11 @@ diff -ru cothreads/example/README cothreads-svn/example/README [1] http://research.microsoft.com/users/simonpj/papers/stm/index.htm#composble [2] https://research.microsoft.com/users/simonpj/papers/stm/index.htm#beautiful -diff -ru cothreads/example/santa.ml cothreads-svn/example/santa.ml ---- cothreads/example/santa.ml 2007-09-12 06:32:40.000000000 +1000 -+++ cothreads-svn/example/santa.ml 2007-09-21 12:36:08.000000000 +1000 -@@ -45,7 +45,7 @@ +diff --git a/example/santa.ml b/example/santa.ml +index d57b07c..60ae296 100644 +--- a/example/santa.ml ++++ b/example/santa.ml +@@ -45,7 +45,7 @@ let await_group {gp_num = num; gp_left = left} = let rec helper gp id task = let in_gate, out_gate = join_group gp in use_gate in_gate; task id; flush stdout; use_gate out_gate; diff --git a/debian/patches/0002-Patch-Makefile.template-to-fix-make-install-target.patch b/debian/patches/0002-Patch-Makefile.template-to-fix-make-install-target.patch new file mode 100644 index 0000000..cae695b --- /dev/null +++ b/debian/patches/0002-Patch-Makefile.template-to-fix-make-install-target.patch @@ -0,0 +1,19 @@ +From: Erik de Castro Lopo <er...@mega-nerd.com> +Date: Thu, 27 Jul 2017 06:19:09 +0200 +Subject: Patch Makefile.template to fix 'make install' target + +--- + Makefile.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.template b/Makefile.template +index bf45dee..b2af8f1 100644 +--- a/Makefile.template ++++ b/Makefile.template +@@ -1,5 +1,5 @@ + # Installation setting: Usually the only parameter needs customization +-INSTALLLIBDIR = $(OCAMLSTDLIBPATH) ++INSTALLLIBDIR = $(DESTDIR)$(OCAMLSTDLIBPATH) + + + # Layout of current project diff --git a/debian/patches/30_correct-doc-generation.dpatch b/debian/patches/0003-Corrects-documentation-generation.patch old mode 100755 new mode 100644 similarity index 57% rename from debian/patches/30_correct-doc-generation.dpatch rename to debian/patches/0003-Corrects-documentation-generation.patch index 1c0acb2..3f3abef --- a/debian/patches/30_correct-doc-generation.dpatch +++ b/debian/patches/0003-Corrects-documentation-generation.patch @@ -1,14 +1,16 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## correct-doc-generation.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Corrects documentation generation. +From: Sylvain Le Gall <gil...@debian.org> +Date: Thu, 27 Jul 2017 06:19:41 +0200 +Subject: Corrects documentation generation -@DPATCH@ -diff -urNad cothreads-0.10~/doc/Makefile cothreads-0.10/doc/Makefile ---- cothreads-0.10~/doc/Makefile 2007-09-11 22:32:40.000000000 +0200 -+++ cothreads-0.10/doc/Makefile 2007-09-26 02:56:36.140575676 +0200 -@@ -6,8 +6,8 @@ +--- + doc/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 25cef3d..dabd5fb 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -6,8 +6,8 @@ all: doc doc: $(MKDIR) html $(MKDIR) man diff --git a/debian/patches/40_non_native_arch.dpatch b/debian/patches/0004-No-not-use-install-native-files-on-non-native-arch.patch old mode 100755 new mode 100644 similarity index 64% rename from debian/patches/40_non_native_arch.dpatch rename to debian/patches/0004-No-not-use-install-native-files-on-non-native-arch.patch index e105c08..e013d23 --- a/debian/patches/40_non_native_arch.dpatch +++ b/debian/patches/0004-No-not-use-install-native-files-on-non-native-arch.patch @@ -1,22 +1,29 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_non_native_arch.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No not use/install native files on non native arch. +From: Sylvain Le Gall <gil...@debian.org> +Date: Thu, 27 Jul 2017 06:20:16 +0200 +Subject: No not use/install native files on non native arch -@DPATCH@ -diff -urNad cothreads-0.10~/doc/Makefile cothreads-0.10/doc/Makefile ---- cothreads-0.10~/doc/Makefile 2007-09-26 03:28:33.000000000 +0200 -+++ cothreads-0.10/doc/Makefile 2007-09-26 03:28:33.089078641 +0200 -@@ -11,3 +11,4 @@ +--- + doc/Makefile | 1 + + example/Makefile | 4 ++++ + src/Makefile | 2 ++ + src/process/Makefile | 10 ++++++++++ + src/threads/Makefile | 10 +++++++++- + 5 files changed, 26 insertions(+), 1 deletion(-) + +diff --git a/doc/Makefile b/doc/Makefile +index dabd5fb..7ffbbab 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -11,3 +11,4 @@ doc: clean: $(RM) html man *~ .depend + -diff -urNad cothreads-0.10~/example/Makefile cothreads-0.10/example/Makefile ---- cothreads-0.10~/example/Makefile 2007-09-26 03:28:33.000000000 +0200 -+++ cothreads-0.10/example/Makefile 2007-09-26 03:28:33.089078641 +0200 -@@ -15,12 +15,16 @@ +diff --git a/example/Makefile b/example/Makefile +index a455322..eeacc38 100644 +--- a/example/Makefile ++++ b/example/Makefile +@@ -15,12 +15,16 @@ PROCOPTPARAM = $(PROCPARAM:%.cma=%.cmxa) $(OCAMLC) -o $@ $(VMPARAM) $< %.nath: %.cmo $(OCAMLC) -o $@ $(NATHPARAM) $< @@ -33,10 +40,11 @@ diff -urNad cothreads-0.10~/example/Makefile cothreads-0.10/example/Makefile ALLTEST = coth evt lock ray_col ray_nocol test mvar merge mcast phil santa all: $(ALLTEST:%=%.vmth) $(ALLTEST:%=%.nath) $(ALLTEST:%=%.nath.opt) $(ALLTEST:%=%.proc) $(ALLTEST:%=%.proc.opt) -diff -urNad cothreads-0.10~/src/Makefile cothreads-0.10/src/Makefile ---- cothreads-0.10~/src/Makefile 2007-09-26 03:28:32.000000000 +0200 -+++ cothreads-0.10/src/Makefile 2007-09-26 03:28:33.089078641 +0200 -@@ -4,7 +4,9 @@ +diff --git a/src/Makefile b/src/Makefile +index bc150e0..d58ecea 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -4,7 +4,9 @@ BACKENDS = threads vmthreads process AUXMOD = libext libextunix AUXMODBYT = $(AUXMOD:%=%.cmo) @@ -46,10 +54,11 @@ diff -urNad cothreads-0.10~/src/Makefile cothreads-0.10/src/Makefile COMMONMOD = mutex condition event COMMONMODINTFSRC = $(COMMONMOD:%=%.mli) -diff -urNad cothreads-0.10~/src/process/Makefile cothreads-0.10/src/process/Makefile ---- cothreads-0.10~/src/process/Makefile 2007-09-26 03:28:32.000000000 +0200 -+++ cothreads-0.10/src/process/Makefile 2007-09-26 03:30:28.124068031 +0200 -@@ -6,24 +6,34 @@ +diff --git a/src/process/Makefile b/src/process/Makefile +index 6388490..7677423 100644 +--- a/src/process/Makefile ++++ b/src/process/Makefile +@@ -6,24 +6,34 @@ BACKEND = process AUXMOD = libext libextunix AUXMODBYT = $(AUXMOD:%=%.cmo) @@ -84,10 +93,11 @@ diff -urNad cothreads-0.10~/src/process/Makefile cothreads-0.10/src/process/Make INSTALLDIR = $(INSTALLLIBDIR)/$(BACKEND) INSTALLFILES = $(COMMONMODINTFCOM) $(EXTRAMODINTFCOM) $(COMMONMODNAT) $(EXTRAMODNAT) $(LIBBYT) $(LIBNAT) $(LIBNATA) -diff -urNad cothreads-0.10~/src/threads/Makefile cothreads-0.10/src/threads/Makefile ---- cothreads-0.10~/src/threads/Makefile 2007-09-26 03:28:32.000000000 +0200 -+++ cothreads-0.10/src/threads/Makefile 2007-09-26 03:31:37.565043372 +0200 -@@ -6,23 +6,31 @@ +diff --git a/src/threads/Makefile b/src/threads/Makefile +index 5aea00f..9b108a6 100644 +--- a/src/threads/Makefile ++++ b/src/threads/Makefile +@@ -6,23 +6,31 @@ BACKEND = threads AUXMOD = libext AUXMODBYT = $(AUXMOD:%=%.cmo) @@ -119,7 +129,7 @@ diff -urNad cothreads-0.10~/src/threads/Makefile cothreads-0.10/src/threads/Make INSTALLDIR = $(INSTALLLIBDIR)/$(BACKEND) INSTALLFILES = $(EXTRAMODINTFCOM) $(EXTRAMODNAT) $(LIBBYT) $(LIBNAT) $(LIBNATA) -@@ -52,4 +60,4 @@ +@@ -52,4 +60,4 @@ install: all clean: ocamlclean uninstall: diff --git a/debian/patches/0005-Corrects-Makefile.template-path.patch b/debian/patches/0005-Corrects-Makefile.template-path.patch new file mode 100644 index 0000000..9c3ee66 --- /dev/null +++ b/debian/patches/0005-Corrects-Makefile.template-path.patch @@ -0,0 +1,18 @@ +From: Sylvain Le Gall <gil...@debian.org> +Date: Thu, 27 Jul 2017 06:20:42 +0200 +Subject: Corrects Makefile.template path + +--- + example/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/example/Makefile b/example/Makefile +index eeacc38..a735cef 100644 +--- a/example/Makefile ++++ b/example/Makefile +@@ -1,4 +1,4 @@ +-include ../Makefile.template ++include ./Makefile.template + + # If coThreads is built but not installed, pass LOCAL variable to make e.g "make all LOCAL=../src" + INCLUDES=$(if $(LOCAL),-I $(LOCAL)) diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 8ffefce..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,5 +0,0 @@ -10_patch_from_svn -20_makefile_destdir -30_correct-doc-generation -40_non_native_arch -50_makefile_example diff --git a/debian/patches/20_makefile_destdir.dpatch b/debian/patches/20_makefile_destdir.dpatch deleted file mode 100755 index 34fcd95..0000000 --- a/debian/patches/20_makefile_destdir.dpatch +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## makefile_destdir.dpatch by Erik de Castro Lopo <er...@mega-nerd.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch Makefile.template to fix 'make install' target. - -@DPATCH@ -diff -ru cothreads-0.10-orig/ cothreads-0.10/ ---- cothreads-0.10-orig/Makefile.template 2007-09-25 16:07:03.000000000 +1000 -+++ cothreads-0.10/Makefile.template 2007-09-25 16:06:52.000000000 +1000 -@@ -1,5 +1,5 @@ - # Installation setting: Usually the only parameter needs customization --INSTALLLIBDIR = $(OCAMLSTDLIBPATH) -+INSTALLLIBDIR = $(DESTDIR)$(OCAMLSTDLIBPATH) - - - # Layout of current project diff --git a/debian/patches/50_makefile_example.dpatch b/debian/patches/50_makefile_example.dpatch deleted file mode 100755 index c3a3c97..0000000 --- a/debian/patches/50_makefile_example.dpatch +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50_makefile_example.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Corrects Makefile.template path. - -@DPATCH@ -diff -urNad cothreads-0.10~/example/Makefile cothreads-0.10/example/Makefile ---- cothreads-0.10~/example/Makefile 2007-09-27 01:16:18.199352976 +0200 -+++ cothreads-0.10/example/Makefile 2007-09-27 01:16:41.654331341 +0200 -@@ -1,4 +1,4 @@ --include ../Makefile.template -+include ./Makefile.template - - IFRAY = $(if $(findstring ray,$@), $(if $(findstring opt,$@),ray.cmx,ray.cmo)) - VMPARAM = -I +vmthreads $(IFRAY) cothreads.cma diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..425c582 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +0001-Pull-a-bunch-of-minor-fixes-from-cothreads-SVN.patch +0002-Patch-Makefile.template-to-fix-make-install-target.patch +0003-Corrects-documentation-generation.patch +0004-No-not-use-install-native-files-on-non-native-arch.patch +0005-Corrects-Makefile.template-path.patch diff --git a/debian/rules b/debian/rules index 2b20991..90e7bfd 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, # MA 02110-1301, USA. -include /usr/share/cdbs/1/rules/dpatch.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/ocaml.mk diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cothreads.git _______________________________________________ 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