The following commit has been merged in the master branch:
commit 3933de242df2e664044de97a12f032f4c13a9ce1
Author: Stephane Glondu <st...@glondu.net>
Date:   Tue May 31 11:11:59 2011 +0200

    Switch patches to quilt

diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index 96bcc87..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e190646..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-matita.conf.xml.in.dpatch
-numbers.dpatch
-native-compilers.dpatch
-slist-sep.dpatch
diff --git a/debian/patches/matita.conf.xml.in.dpatch 
b/debian/patches/matita.conf.xml.in.patch
old mode 100755
new mode 100644
similarity index 74%
rename from debian/patches/matita.conf.xml.in.dpatch
rename to debian/patches/matita.conf.xml.in.patch
index 814f967..bb777a4
--- a/debian/patches/matita.conf.xml.in.dpatch
+++ b/debian/patches/matita.conf.xml.in.patch
@@ -1,13 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## matita.conf.xml.in.dpatch by Enrico Tassi <gareuselesi...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch to use sqlite backend in the default configuration
+From: Enrico Tassi <gareuselesi...@debian.org>
+Date: Tue, 31 May 2011 11:09:13 +0200
+Subject: matita.conf.xml.in
 
-@DPATCH@
-diff -urNad trunk~/matita/matita.conf.xml.in trunk/matita/matita.conf.xml.in
---- trunk~/matita/matita.conf.xml.in   2008-01-11 20:13:29.000000000 +0100
-+++ trunk/matita/matita.conf.xml.in    2009-10-11 23:20:31.000000000 +0200
+Patch to use sqlite backend in the default configuration.
+---
+ matita/matita.conf.xml.in |   14 ++++++--------
+ 1 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/matita/matita.conf.xml.in b/matita/matita.conf.xml.in
+index aeb8af0..2198eb8 100644
+--- a/matita/matita.conf.xml.in
++++ b/matita/matita.conf.xml.in
 @@ -50,17 +50,18 @@
  
      <!-- The following snippet is used by the helm team
@@ -52,3 +55,4 @@ diff -urNad trunk~/matita/matita.conf.xml.in 
trunk/matita/matita.conf.xml.in
 +-->
    </section>
  </helm_registry>
+-- 
diff --git a/debian/patches/native-compilers.dpatch 
b/debian/patches/native-compilers.dpatch
deleted file mode 100755
index 8c901a9..0000000
--- a/debian/patches/native-compilers.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## native-compilers.dpatch by Enrico Tassi <gareuselesi...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: disable native compilers on ia64 and alpha
-
-@DPATCH@
-diff -urNad trunk~/Makefile.defs.in trunk/Makefile.defs.in
---- trunk~/Makefile.defs.in    2007-11-25 15:36:52.000000000 +0100
-+++ trunk/Makefile.defs.in     2007-12-11 14:20:44.000000000 +0100
-@@ -5,7 +5,17 @@
- endif
- CAMLP5O = @CAMLP5O@
- LABLGLADECC = @LABLGLADECC@
--HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
-+# debian specific limitation of architecture on which native compilers are 
used
-+ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "alpha"
-+      HAVE_OCAMLOPT = no
-+else 
-+ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "ia64"
-+      HAVE_OCAMLOPT = no
-+else
-+      HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
-+endif
-+endif
-+
- DISTRIBUTED = @DISTRIBUTED@
- 
- MATITA_REQUIRES = @FINDLIB_REQUIRES@
diff --git a/debian/patches/native-compilers.patch 
b/debian/patches/native-compilers.patch
new file mode 100644
index 0000000..f6378dc
--- /dev/null
+++ b/debian/patches/native-compilers.patch
@@ -0,0 +1,33 @@
+From: Enrico Tassi <gareuselesi...@debian.org>
+Date: Tue, 31 May 2011 11:10:17 +0200
+Subject: native-compilers
+
+Disable native compilers on ia64 and alpha.
+---
+ Makefile.defs.in |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.defs.in b/Makefile.defs.in
+index d7a7620..b33d5cc 100644
+--- a/Makefile.defs.in
++++ b/Makefile.defs.in
+@@ -5,7 +5,17 @@ OCAMLFIND = @OCAMLFIND@
+ endif
+ CAMLP5O = @CAMLP5O@
+ LABLGLADECC = @LABLGLADECC@
+-HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
++# debian specific limitation of architecture on which native compilers are 
used
++ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "alpha"
++      HAVE_OCAMLOPT = no
++else 
++ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "ia64"
++      HAVE_OCAMLOPT = no
++else
++      HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
++endif
++endif
++
+ DISTRIBUTED = @DISTRIBUTED@
+ ANNOT = @ANNOT@
+ 
+-- 
diff --git a/debian/patches/numbers.dpatch b/debian/patches/numbers.dpatch
deleted file mode 100755
index fc26894..0000000
--- a/debian/patches/numbers.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## numbers.dpatch by Enrico Tassi <gareuselesi...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: disable Coq numbers
-
-@DPATCH@
-diff -urNad trunk~/components/cic_disambiguation/number_notation.ml 
trunk/components/cic_disambiguation/number_notation.ml
---- trunk~/components/cic_disambiguation/number_notation.ml    2009-05-14 
15:43:55.000000000 +0200
-+++ trunk/components/cic_disambiguation/number_notation.ml     2009-10-11 
23:06:41.000000000 +0200
-@@ -49,7 +49,7 @@
- 
- let _ =
-   DisambiguateChoices.add_num_choice
--    ("natural number", `Num_interp interp_natural_number);
-+    ("natural number", `Num_interp interp_natural_number); (*
-   DisambiguateChoices.add_num_choice
-     ("Coq natural number",
-       `Num_interp (fun num -> HelmLibraryObjects.build_nat (int_of_string 
num)));
-@@ -76,3 +76,4 @@
-             HelmLibraryObjects.build_bin_pos num ]
-         else
-           assert false))
-+          *)
diff --git a/debian/patches/numbers.patch b/debian/patches/numbers.patch
new file mode 100644
index 0000000..4ea7ef2
--- /dev/null
+++ b/debian/patches/numbers.patch
@@ -0,0 +1,28 @@
+From: Enrico Tassi <gareuselesi...@debian.org>
+Date: Tue, 31 May 2011 11:09:49 +0200
+Subject: numbers
+
+Disable Coq numbers.
+---
+ components/cic_disambiguation/number_notation.ml |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/components/cic_disambiguation/number_notation.ml 
b/components/cic_disambiguation/number_notation.ml
+index 179725e..7fc320e 100644
+--- a/components/cic_disambiguation/number_notation.ml
++++ b/components/cic_disambiguation/number_notation.ml
+@@ -49,7 +49,7 @@ let interp_natural_number num =
+ 
+ let _ =
+   DisambiguateChoices.add_num_choice
+-    ("natural number", `Num_interp interp_natural_number);
++    ("natural number", `Num_interp interp_natural_number); (*
+   DisambiguateChoices.add_num_choice
+     ("Coq natural number",
+       `Num_interp (fun num -> HelmLibraryObjects.build_nat (int_of_string 
num)));
+@@ -76,3 +76,4 @@ let _ =
+             HelmLibraryObjects.build_bin_pos num ]
+         else
+           assert false))
++          *)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..52d7f55
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+matita.conf.xml.in.patch
+numbers.patch
+native-compilers.patch
+slist-sep.patch
diff --git a/debian/patches/slist-sep.dpatch b/debian/patches/slist-sep.patch
old mode 100755
new mode 100644
similarity index 58%
rename from debian/patches/slist-sep.dpatch
rename to debian/patches/slist-sep.patch
index 095d38f..cc64226
--- a/debian/patches/slist-sep.dpatch
+++ b/debian/patches/slist-sep.patch
@@ -1,14 +1,18 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## slist-sep.dpatch by Colin Watson <cjwat...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Port to current OCaml/CamlP5.  r11210 from upstream SVN.
+From: Colin Watson <cjwat...@ubuntu.com>
+Date: Tue, 31 May 2011 11:11:01 +0200
+Subject: slist-sep
 
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
matita~/components/content_pres/cicNotationParser.ml 
matita/components/content_pres/cicNotationParser.ml
---- matita~/components/content_pres/cicNotationParser.ml       2009-09-21 
11:01:28.000000000 +0100
-+++ matita/components/content_pres/cicNotationParser.ml        2011-05-21 
09:18:45.000000000 +0100
-@@ -211,8 +211,8 @@
+Port to current OCaml/CamlP5.  r11210 from upstream SVN.
+---
+ components/content_pres/cicNotationParser.ml |    4 ++--
+ components/grafite_parser/print_grammar.ml   |    6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/components/content_pres/cicNotationParser.ml 
b/components/content_pres/cicNotationParser.ml
+index 3a3e79d..5725dfb 100644
+--- a/components/content_pres/cicNotationParser.ml
++++ b/components/content_pres/cicNotationParser.ml
+@@ -211,8 +211,8 @@ let extract_term_production pattern =
            match magic with
            | Ast.List0 (_, None) -> Gramext.Slist0 s
            | Ast.List1 (_, None) -> Gramext.Slist1 s
@@ -19,10 +23,11 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
            | _ -> assert false
          in
          [ Env (List.map Env.list_declaration p_names),
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
matita~/components/grafite_parser/print_grammar.ml 
matita/components/grafite_parser/print_grammar.ml
---- matita~/components/grafite_parser/print_grammar.ml 2009-05-25 
16:39:26.000000000 +0100
-+++ matita/components/grafite_parser/print_grammar.ml  2011-05-21 
09:18:05.000000000 +0100
-@@ -87,7 +87,7 @@
+diff --git a/components/grafite_parser/print_grammar.ml 
b/components/grafite_parser/print_grammar.ml
+index 38750e1..736c850 100644
+--- a/components/grafite_parser/print_grammar.ml
++++ b/components/grafite_parser/print_grammar.ml
+@@ -87,7 +87,7 @@ and is_symbol_dummy = function
    | Smeta (_, lt, _) -> List.for_all is_symbol_dummy lt
    | Snterm e | Snterml (e, _) -> is_entry_dummy e
    | Slist1 x | Slist0 x -> is_symbol_dummy x
@@ -31,7 +36,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
    | Sopt x -> is_symbol_dummy x
    | Sself | Snext -> false
    | Stree t -> is_tree_dummy t
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ let visit_description desc fmt self =
          let todo = visit_symbol symbol todo is_son in
          Format.fprintf fmt "@]} @ ";
          todo
@@ -40,7 +45,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
          Format.fprintf fmt "[@[<hov2> ";
          let todo = visit_symbol symbol todo is_son in
          Format.fprintf fmt "{@[<hov2> ";
-@@ -200,7 +200,7 @@
+@@ -200,7 +200,7 @@ let visit_description desc fmt self =
          let todo = visit_symbol symbol todo is_son in
          Format.fprintf fmt "@]}+ @ ";
          todo 
@@ -49,3 +54,4 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
          let todo = visit_symbol symbol todo is_son  in
          Format.fprintf fmt "{@[<hov2> ";
          let todo = visit_symbol sep todo is_son in
+-- 

-- 
matita 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