This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository mlgmp.
commit df98bf28f3ee24d3e9f72274f1a3e97a45eb9bfe Author: Ralf Treinen <trei...@free.fr> Date: Wed Aug 12 13:14:22 2015 +0200 source format 3.0 (quilt) --- debian/changelog | 7 +++- debian/control | 1 - debian/patches/00list | 4 -- debian/patches/10_config | 11 +++++ debian/patches/10_config.dpatch | 31 -------------- debian/patches/{11_Makefile.dpatch => 11_Makefile} | 24 +---------- debian/patches/{15_bugfixes.dpatch => 15_bugfixes} | 8 +--- debian/patches/{20_mlgmp_z.dpatch => 20_mlgmp_z} | 47 +++++++++++----------- debian/patches/series | 4 ++ debian/rules | 5 +-- debian/source/format | 2 +- 11 files changed, 52 insertions(+), 92 deletions(-) diff --git a/debian/changelog b/debian/changelog index 907e61b..c00ec46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,13 @@ mlgmp (20021123-18) UNRELEASED; urgency=low * Remove Sven Luther from uploaders (closes: #677755) * Standards-Vesion 3.9.6: d/rules: add targets build-indep and build-arch + * Convert to source format 3.0 (quilt): + - update source/format + - drop build-dependency on dpatch + - convert patches in debian/patches + - drop explicit patching in debian/rules - -- Ralf Treinen <trei...@debian.org> Mon, 10 Aug 2015 11:52:47 +0200 + -- Ralf Treinen <trei...@debian.org> Wed, 12 Aug 2015 13:12:53 +0200 mlgmp (20021123-17) unstable; urgency=low diff --git a/debian/control b/debian/control index 34c66b7..db454a5 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Build-Depends: ocaml-nox (>= 3.11.1-3~), debhelper (>= 7.0.0), - dpatch, libgmp3-dev, libmpfr-dev, dh-ocaml (>= 0.9~) diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 8b5ae06..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,4 +0,0 @@ -10_config.dpatch -11_Makefile.dpatch -15_bugfixes.dpatch -20_mlgmp_z.dpatch diff --git a/debian/patches/10_config b/debian/patches/10_config new file mode 100644 index 0000000..a3edbae --- /dev/null +++ b/debian/patches/10_config @@ -0,0 +1,11 @@ +Author: Mike Furr <mf...@debian.org> +Description: Disabling MPFR + +--- mlgmp-20021123.orig/config.h ++++ mlgmp-20021123/config.h +@@ -1,5 +1,5 @@ + #define SERIALIZE +-#define USE_MPFR ++/*#define USE_MPFR*/ + #define NDEBUG + #undef TRACE diff --git a/debian/patches/10_config.dpatch b/debian/patches/10_config.dpatch deleted file mode 100755 index b5ff580..0000000 --- a/debian/patches/10_config.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e -## 10_Makefile.dpatch by Mike Furr <mf...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Disabling MPFR - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 -@DPATCH@ ---- mlgmp-20021123.orig/config.h -+++ mlgmp-20021123/config.h -@@ -1,5 +1,5 @@ - #define SERIALIZE --#define USE_MPFR -+/*#define USE_MPFR*/ - #define NDEBUG - #undef TRACE diff --git a/debian/patches/11_Makefile.dpatch b/debian/patches/11_Makefile old mode 100755 new mode 100644 similarity index 83% rename from debian/patches/11_Makefile.dpatch rename to debian/patches/11_Makefile index cf2f2e4..cf6e924 --- a/debian/patches/11_Makefile.dpatch +++ b/debian/patches/11_Makefile @@ -1,26 +1,6 @@ -#! /bin/sh -e -## 10_Makefile.dpatch by Mike Furr <mf...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Handling non-native archs and proper handling of .so generation +Author: Mike Furr <mf...@debian.org> +Description: Handling non-native archs and proper handling of .so generation -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 -@DPATCH@ diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.HWFzlv/mlgmp-20021123/Makefile --- ./Makefile 2005-09-03 15:15:47.339340437 -0400 +++ /tmp/dpep-work.HWFzlv/mlgmp-20021123/Makefile 2005-09-03 15:15:56.140184593 -0400 diff --git a/debian/patches/15_bugfixes.dpatch b/debian/patches/15_bugfixes old mode 100755 new mode 100644 similarity index 95% rename from debian/patches/15_bugfixes.dpatch rename to debian/patches/15_bugfixes index d95a122..40fd3a7 --- a/debian/patches/15_bugfixes.dpatch +++ b/debian/patches/15_bugfixes @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15_bugfixes.dpatch by Mike Furr <mf...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Various bugfixes in C bindings +Author: Mike Furr <mf...@debian.org> +Description: Various bugfixes in C bindings -@DPATCH@ diff -urNad --exclude=CVS --exclude=.svn ./gmp.ml /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.ml --- ./gmp.ml 2002-11-23 08:13:53.000000000 -0500 +++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.ml 2005-09-03 15:18:53.505890041 -0400 diff --git a/debian/patches/20_mlgmp_z.dpatch b/debian/patches/20_mlgmp_z old mode 100755 new mode 100644 similarity index 90% rename from debian/patches/20_mlgmp_z.dpatch rename to debian/patches/20_mlgmp_z index b92ff91..d6298ae --- a/debian/patches/20_mlgmp_z.dpatch +++ b/debian/patches/20_mlgmp_z @@ -8,10 +8,11 @@ ## DP: Fix wrong conversion from int on 64 bits computers. @DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mlgmp~/mlgmp_z.c mlgmp/mlgmp_z.c ---- mlgmp~/mlgmp_z.c 2010-06-03 22:34:02.000000000 +0200 -+++ mlgmp/mlgmp_z.c 2010-06-03 22:38:50.000000000 +0200 -@@ -63,7 +63,7 @@ +Index: mlgmp/mlgmp_z.c +=================================================================== +--- mlgmp.orig/mlgmp_z.c 2015-08-12 13:08:45.326850457 +0200 ++++ mlgmp/mlgmp_z.c 2015-08-12 13:08:45.322850442 +0200 +@@ -70,7 +70,7 @@ CAMLparam1(ml_val); CAMLlocal1(r); r=alloc_mpz(); @@ -20,7 +21,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(r); } -@@ -88,7 +88,7 @@ +@@ -95,7 +95,7 @@ value _mlgmp_z2_from_int(value r, value ml_val) { CAMLparam2(r, ml_val); @@ -29,7 +30,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(Val_unit); } -@@ -151,14 +151,14 @@ +@@ -158,14 +158,14 @@ CAMLparam2(a, b); \ CAMLlocal1(r); \ r=alloc_init_mpz(); \ @@ -46,7 +47,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(Val_unit); \ } -@@ -196,7 +196,7 @@ +@@ -203,7 +203,7 @@ CAMLparam3(a, b, modulus); CAMLlocal1(r); r=alloc_init_mpz(); @@ -55,7 +56,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(r); } -@@ -205,7 +205,7 @@ +@@ -212,7 +212,7 @@ CAMLparam2(a, b); CAMLlocal1(r); r=alloc_init_mpz(); @@ -64,7 +65,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(r); } -@@ -221,14 +221,14 @@ +@@ -228,14 +228,14 @@ value _mlgmp_z2_powm_ui(value r, value a, value b, value modulus) { CAMLparam4(r, a, b, modulus); @@ -81,7 +82,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(Val_unit); } -@@ -376,7 +376,7 @@ +@@ -383,7 +383,7 @@ { \ CAMLparam2(n, d); \ CAMLlocal3(q, r, qr); \ @@ -90,7 +91,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ui_d) division_by_zero(); \ \ -@@ -395,7 +395,7 @@ +@@ -402,7 +402,7 @@ { \ CAMLparam2(n, d); \ CAMLlocal1(q); \ @@ -99,7 +100,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ui_d) division_by_zero(); \ \ -@@ -409,7 +409,7 @@ +@@ -416,7 +416,7 @@ value _mlgmp_z2_##kind##div_q_ui(value q, value n, value d) \ { \ CAMLparam3(q, n, d); \ @@ -108,7 +109,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ui_d) division_by_zero(); \ \ -@@ -422,7 +422,7 @@ +@@ -429,7 +429,7 @@ { \ CAMLparam2(n, d); \ CAMLlocal1(r); \ @@ -117,7 +118,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ui_d) division_by_zero(); \ \ -@@ -436,7 +436,7 @@ +@@ -443,7 +443,7 @@ value _mlgmp_z2_##kind##div_r_ui(value r, value n, value d) \ { \ CAMLparam3(r, n, d); \ @@ -126,7 +127,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ui_d) division_by_zero(); \ \ -@@ -448,7 +448,7 @@ +@@ -455,7 +455,7 @@ value _mlgmp_z_##kind##div_ui(value n, value d) \ { \ CAMLparam2(n, d); \ @@ -135,7 +136,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ui_d) division_by_zero(); \ \ -@@ -492,7 +492,7 @@ +@@ -499,7 +499,7 @@ { \ CAMLparam2(n, d); \ CAMLlocal1(q); \ @@ -144,7 +145,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ld) \ division_by_zero(); \ -@@ -507,7 +507,7 @@ +@@ -514,7 +514,7 @@ value _mlgmp_z2_##op(value q, value n, value d) \ { \ CAMLparam3(q, n, d); \ @@ -153,7 +154,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' \ if (! ld) \ division_by_zero(); \ -@@ -584,7 +584,7 @@ +@@ -591,7 +591,7 @@ value _mlgmp_z_compare_si(value a, value b) { CAMLparam2(a, b); @@ -162,7 +163,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' } /*** Number theory */ -@@ -645,13 +645,13 @@ +@@ -652,13 +652,13 @@ value _mlgmp_z_kronecker_si(value a, value b) { CAMLparam2(a, b); @@ -178,7 +179,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' } value _mlgmp_z_remove(value a, value b) -@@ -673,7 +673,7 @@ +@@ -680,7 +680,7 @@ CAMLparam1(a); \ CAMLlocal1(r); \ r = alloc_init_mpz(); \ @@ -187,7 +188,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(r); \ } -@@ -686,7 +686,7 @@ +@@ -693,7 +693,7 @@ CAMLparam2(n, k); CAMLlocal1(r); r = alloc_init_mpz(); @@ -196,7 +197,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' CAMLreturn(r); } -@@ -711,7 +711,7 @@ +@@ -718,7 +718,7 @@ value _mlgmp_z_##op(value a, value b) \ { \ CAMLparam2(a, b); \ @@ -205,7 +206,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' } z_int_binary_op_ui(scan0) -@@ -724,7 +724,7 @@ +@@ -731,7 +731,7 @@ CAMLparam2(state, n); \ CAMLlocal1(r); \ r = alloc_init_mpz(); \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..adbf77a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +10_config +11_Makefile +15_bugfixes +20_mlgmp_z diff --git a/debian/rules b/debian/rules index eafd173..75e0704 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ PACKAGE=libgmp-ocaml include /usr/share/ocaml/ocamlvars.mk -include /usr/share/dpatch/dpatch.make ifeq ($(OCAML_HAVE_OCAMLOPT),yes) HAS_OPT="HAS_OPT=1" @@ -14,13 +13,13 @@ endif build: build-arch build-indep build-arch: build-stamp build-indep: -build-stamp: patch +build-stamp: dh build --with ocaml $(MAKE) depend $(MAKE) $(HAS_OPT) touch build-stamp -clean: clean1 unpatch +clean: clean1 clean1: $(MAKE) clean dh clean --with ocaml diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mlgmp.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