The following commit has been merged in the master branch: commit 53cf1b90ef8b3536535d5376e460b564a89a09e7 Author: Mehdi Dogguy <me...@dogguy.org> Date: Wed Dec 14 14:06:27 2011 +0100
Add more patches diff --git a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch new file mode 100644 index 0000000..5b751b0 --- /dev/null +++ b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch @@ -0,0 +1,22 @@ +From: Mehdi Dogguy <me...@dogguy.org> +Date: Wed, 14 Dec 2011 14:05:46 +0100 +Subject: PRECM{O,X} is needed to link altgr-ergo + +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6a84eb4..b9d9afc 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -117,7 +117,7 @@ GENERATED = version.ml \ + smt_parser.ml smt_parser.mli smt_lex.ml \ + smtlib2_parse.ml smtlib2_parse.mli smtlib2_lex.ml + +-GUICMO = $(CMO) $(CMOFRONT) why_annoted.cmo why_connected.cmo gui.cmo ++GUICMO = $(PRECMO) $(CMO) $(CMOFRONT) why_annoted.cmo why_connected.cmo gui.cmo + GUICMX = $(GUICMO:.cmo=.cmx) + + byte: $(NAME).byte +-- diff --git a/debian/patches/0007-Fix-all-target.patch b/debian/patches/0007-Fix-all-target.patch new file mode 100644 index 0000000..d7309c2 --- /dev/null +++ b/debian/patches/0007-Fix-all-target.patch @@ -0,0 +1,28 @@ +From: Mehdi Dogguy <me...@dogguy.org> +Date: Wed, 14 Dec 2011 15:01:27 +0100 +Subject: Fix 'all' target + +--- + Makefile.in | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b9d9afc..a59ec52 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -74,7 +74,13 @@ LIBNAME = altErgo + BYTE=$(NAME).byte + OPT=$(NAME).opt + +-all: pack xpack $(OCAMLBEST) pack xpack ++all:: ++ ++ifeq ($(OCAMLBEST),opt) ++all:: pack xpack opt pack xpack ++else ++all:: pack byte pack ++endif + + # bytecode and native-code compilation + ###################################### +-- diff --git a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch new file mode 100644 index 0000000..a4459d8 --- /dev/null +++ b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch @@ -0,0 +1,36 @@ +From: Mehdi Dogguy <me...@dogguy.org> +Date: Wed, 14 Dec 2011 15:29:53 +0100 +Subject: Split install-pack into two separate targets (opt and byte) + +--- + Makefile.in | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index a59ec52..4b02288 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -225,13 +225,21 @@ install-gui: install-indep + cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE) + cp -f util/gtk-lang/alt-ergo.lang /usr/share/gtksourceview-2.0/language-specs/alt-ergo.lang + +-install-pack: xpack pack ++install-pack-opt: xpack + mkdir -p $(LIBDIR) + cp -f $(LIBNAME).cmx $(LIBDIR) + cp -f $(LIBNAME).o $(LIBDIR) ++ ++install-pack-byte: pack ++ mkdir -p $(LIBDIR) + cp -f $(LIBNAME).cmo $(LIBDIR) + cp -f $(LIBNAME).cmi $(LIBDIR) + ++install-pack:: install-pack-byte ++ifeq ($(OCAMLBEST),opt) ++install-pack:: install-pack-opt ++endif ++ + # documentation + ############### + +-- diff --git a/debian/patches/0009-fix-install-gui-target.patch b/debian/patches/0009-fix-install-gui-target.patch new file mode 100644 index 0000000..d99b296 --- /dev/null +++ b/debian/patches/0009-fix-install-gui-target.patch @@ -0,0 +1,24 @@ +From: Mehdi Dogguy <me...@dogguy.org> +Date: Wed, 14 Dec 2011 16:04:05 +0100 +Subject: 'fix' install-gui target + +--- + Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 4b02288..3df30e2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -222,8 +222,8 @@ install-man: + + install-gui: install-indep + mkdir -p $(BINDIR) +- cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE) +- cp -f util/gtk-lang/alt-ergo.lang /usr/share/gtksourceview-2.0/language-specs/alt-ergo.lang ++ cp -f altgr-ergo.$(OCAMLBEST) $(BINDIR)/altgr-ergo$(EXE) ++ cp -f util/gtk-lang/alt-ergo.lang $(prefix)/share/gtksourceview-2.0/language-specs/alt-ergo.lang + + install-pack-opt: xpack + mkdir -p $(LIBDIR) +-- diff --git a/debian/patches/series b/debian/patches/series index 2182652..834f7f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,7 @@ 0003-Fix-a-typo.patch 0004-Add-rules-and-targets-for-gui.byte.patch 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch +0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch +0007-Fix-all-target.patch +0008-Split-install-pack-into-two-separate-targets-opt-and.patch +0009-fix-install-gui-target.patch -- alt-ergo 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