[Pkg-ocaml-maint-commits] [ocp-indent] 04/04: Release 1.5.2-1 to unstable
Johannes Schauer
josch at moszumanska.debian.org
Sun Jan 31 10:56:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch master
in repository ocp-indent.
commit a345916c7022992701f5706ec71360a34b2efc8f
Author: Johannes Schauer <josch at debian.org>
Date: Sun Jan 31 10:49:13 2016 +0100
Release 1.5.2-1 to unstable
- new upstream version
- remove patches that have been fixed upstream:
- fix-Makefile.simple-syntax-error
- let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT
- remove-approx_common-from-Makefile.simple
- install cmo and .o files into libocp-indent-lib-ocaml-dev
- move logic for building and installing additional content from
debian/rules to patches for Makefile.simple to allow upstreaming
them:
- fix-Makefile.simple-install-target
- fix-Makefile.simple-libname
- fix-Makefile.simple-install-ocp-indent-bin
- fix-Makefile.simple-install-vim-emacs-indent
- fix-Makefile.simple-clean-symlinks
- fix-Makefile.simple-install-cmo-and-o
- fix-Makefile.simple-install-cmx
- add patch fixing spelling: fix-spelling
---
debian/changelog | 23 +++++++++
debian/libocp-indent-lib-ocaml-dev.install.in | 4 +-
debian/patches/fix-Makefile.simple-clean-symlinks | 10 ++++
.../patches/fix-Makefile.simple-install-cmo-and-o | 14 +++++
debian/patches/fix-Makefile.simple-install-cmx | 11 ++++
.../fix-Makefile.simple-install-ocp-indent-bin | 14 +++++
debian/patches/fix-Makefile.simple-install-target | 8 +++
.../fix-Makefile.simple-install-vim-emacs-indent | 8 +++
debian/patches/fix-Makefile.simple-libname | 28 ++++++++++
debian/patches/fix-Makefile.simple-syntax-error | 16 ------
debian/patches/fix-spelling | 11 ++++
...let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT | 60 ----------------------
.../remove-approx_common-from-Makefile.simple | 33 ------------
debian/patches/series | 11 ++--
debian/rules | 22 +-------
15 files changed, 138 insertions(+), 135 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 127d207..016a717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+ocp-indent (1.5.2-1) unstable; urgency=medium
+
+ * new upstream release
+ - fixes compilation problems (closes: #812300)
+ * remove patches that have been fixed upstream:
+ - fix-Makefile.simple-syntax-error
+ - let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT
+ - remove-approx_common-from-Makefile.simple
+ * install cmo and .o files into libocp-indent-lib-ocaml-dev
+ * move logic for building and installing additional content from
+ debian/rules to patches for Makefile.simple to allow upstreaming
+ them:
+ - fix-Makefile.simple-install-target
+ - fix-Makefile.simple-libname
+ - fix-Makefile.simple-install-ocp-indent-bin
+ - fix-Makefile.simple-install-vim-emacs-indent
+ - fix-Makefile.simple-clean-symlinks
+ - fix-Makefile.simple-install-cmo-and-o
+ - fix-Makefile.simple-install-cmx
+ * add patch fixing spelling: fix-spelling
+
+ -- Johannes Schauer <josch at debian.org> Sun, 31 Jan 2016 10:52:52 +0100
+
ocp-indent (1.5-2) unstable; urgency=medium
* add Christopher Zimmerman to d/copyright, install vim plugin in different
diff --git a/debian/libocp-indent-lib-ocaml-dev.install.in b/debian/libocp-indent-lib-ocaml-dev.install.in
index 7710560..962eaaa 100644
--- a/debian/libocp-indent-lib-ocaml-dev.install.in
+++ b/debian/libocp-indent-lib-ocaml-dev.install.in
@@ -1,7 +1,7 @@
-#@OCamlStdlibDir@/ocp-indent-lib/*.cmo
+ at OCamlStdlibDir@/ocp-indent-lib/*.cmo
@OCamlStdlibDir@/ocp-indent-lib/*.cmi
@OCamlStdlibDir@/ocp-indent-lib/*.ml*
-#OPT: @OCamlStdlibDir@/ocp-indent-lib/*.o
+OPT: @OCamlStdlibDir@/ocp-indent-lib/*.o
OPT: @OCamlStdlibDir@/ocp-indent-lib/*.cmxa
OPT: @OCamlStdlibDir@/ocp-indent-lib/*.a
OPT: @OCamlStdlibDir@/ocp-indent-lib/*.cmx
diff --git a/debian/patches/fix-Makefile.simple-clean-symlinks b/debian/patches/fix-Makefile.simple-clean-symlinks
new file mode 100644
index 0000000..1a338c5
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-clean-symlinks
@@ -0,0 +1,10 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -54,6 +54,7 @@ $(LIB).cma $(LIB).cmxa $(LIB).a $(LIB).c
+ clean:
+ rm -rf $(GENERATED) META _build
+ rm -rf $(BINS) ocp-indent.1
++ rm -f indentMain.native indentMain.byte
+
+ META:
+ mkdir -p _build/src
diff --git a/debian/patches/fix-Makefile.simple-install-cmo-and-o b/debian/patches/fix-Makefile.simple-install-cmo-and-o
new file mode 100644
index 0000000..caa4eb2
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-install-cmo-and-o
@@ -0,0 +1,14 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -68,9 +68,10 @@ install: META $(LIBS) $(BINS)
+ ocamlfind remove $(LIB) || true
+ ocamlfind install $(LIB) \
+ $(LIBS:%=_build/src/%) META \
+- _build/src/*.mli _build/src/*.cmi
++ _build/src/*.mli _build/src/*.cmi _build/src/*.cmo
+ ifeq ($(BEST),native)
+ cp _build/src/indentMain.native $(DESTDIR)/usr/bin/ocp-indent
++ ocamlfind install $(LIB) _build/src/*.o
+ else
+ cp _build/src/indentMain.byte $(DESTDIR)/usr/bin/ocp-indent
+ endif
diff --git a/debian/patches/fix-Makefile.simple-install-cmx b/debian/patches/fix-Makefile.simple-install-cmx
new file mode 100644
index 0000000..0643c1c
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-install-cmx
@@ -0,0 +1,11 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -71,7 +71,7 @@ install: META $(LIBS) $(BINS)
+ _build/src/*.mli _build/src/*.cmi _build/src/*.cmo
+ ifeq ($(BEST),native)
+ cp _build/src/indentMain.native $(DESTDIR)/usr/bin/ocp-indent
+- ocamlfind install $(LIB) _build/src/*.o
++ ocamlfind install $(LIB) _build/src/*.o _build/src/*.cmx
+ else
+ cp _build/src/indentMain.byte $(DESTDIR)/usr/bin/ocp-indent
+ endif
diff --git a/debian/patches/fix-Makefile.simple-install-ocp-indent-bin b/debian/patches/fix-Makefile.simple-install-ocp-indent-bin
new file mode 100644
index 0000000..b66ad62
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-install-ocp-indent-bin
@@ -0,0 +1,14 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -66,5 +66,10 @@ META:
+ install: META $(LIBS) $(BINS)
+ ocamlfind remove $(LIB) || true
+ ocamlfind install $(LIB) \
+- $(LIBS:%=_build/src/%) $(BINS) META \
++ $(LIBS:%=_build/src/%) META \
+ _build/src/*.mli _build/src/*.cmi
++ifeq ($(BEST),native)
++ cp _build/src/indentMain.native $(DESTDIR)/usr/bin/ocp-indent
++else
++ cp _build/src/indentMain.byte $(DESTDIR)/usr/bin/ocp-indent
++endif
diff --git a/debian/patches/fix-Makefile.simple-install-target b/debian/patches/fix-Makefile.simple-install-target
new file mode 100644
index 0000000..35406b1
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-install-target
@@ -0,0 +1,8 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -68,4 +68,4 @@ install: META $(LIBS) $(BINS)
+ ocamlfind remove $(NAME) || true
+ ocamlfind install $(NAME) \
+ $(LIBS:%=_build/src/%) $(BINS) META \
+- _build/src/*.{mli,cmi,cmt,cmti,annot}
++ _build/src/*.mli _build/src/*.cmi
diff --git a/debian/patches/fix-Makefile.simple-install-vim-emacs-indent b/debian/patches/fix-Makefile.simple-install-vim-emacs-indent
new file mode 100644
index 0000000..b204b08
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-install-vim-emacs-indent
@@ -0,0 +1,8 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -73,3 +73,5 @@ ifeq ($(BEST),native)
+ else
+ cp _build/src/indentMain.byte $(DESTDIR)/usr/bin/ocp-indent
+ endif
++ cp tools/ocp-indent.el $(DESTDIR)/usr/share/emacs/site-lisp/ocp-indent.el
++ cp tools/ocp-indent.vim $(DESTDIR)/usr/share/ocp-indent/vim/indent/ocaml.vim
diff --git a/debian/patches/fix-Makefile.simple-libname b/debian/patches/fix-Makefile.simple-libname
new file mode 100644
index 0000000..831cab9
--- /dev/null
+++ b/debian/patches/fix-Makefile.simple-libname
@@ -0,0 +1,28 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -2,7 +2,6 @@
+
+ GENERATED = src/indentVersion.ml src/compat.ml
+
+-NAME = 'ocp-indent'
+ VERSION != awk -F'[(,)]' '/AC_INIT/ { print $$3 }' configure.ac
+
+ BEST != if ocamlopt 2>/dev/null; then echo native; else echo byte; fi
+@@ -58,14 +57,14 @@ clean:
+
+ META:
+ mkdir -p _build/src
+- echo 'name = "'$(NAME)'"' >$@
++ echo 'name = "'$(LIB)'"' >$@
+ echo 'version = "'$(VERSION)'"' >> $@
+ echo 'archive(byte) = "'$(LIB)'.cma"' >> $@
+ echo 'archive(native) = "'$(LIB)'.cmxa"' >> $@
+
+ .PHONY: install
+ install: META $(LIBS) $(BINS)
+- ocamlfind remove $(NAME) || true
+- ocamlfind install $(NAME) \
++ ocamlfind remove $(LIB) || true
++ ocamlfind install $(LIB) \
+ $(LIBS:%=_build/src/%) $(BINS) META \
+ _build/src/*.mli _build/src/*.cmi
diff --git a/debian/patches/fix-Makefile.simple-syntax-error b/debian/patches/fix-Makefile.simple-syntax-error
deleted file mode 100644
index ce87e85..0000000
--- a/debian/patches/fix-Makefile.simple-syntax-error
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix syntax error in Makefile.simple
- Introduced in commit ae057b47
-Author: josch <j.schauer at email.de>
-Forwarded: https://github.com/OCamlPro/ocp-indent/issues/146
-
---- a/Makefile.simple
-+++ b/Makefile.simple
-@@ -29,7 +29,7 @@ ALWAYS:
- ocamlbuild src/$@
-
- %.cmxs: ALWAYS $(GENERATED)
-- ocamlbuild src/$@
-+ ocamlbuild src/$@
-
- .PHONY: clean
- clean:
diff --git a/debian/patches/fix-spelling b/debian/patches/fix-spelling
new file mode 100644
index 0000000..dd76844
--- /dev/null
+++ b/debian/patches/fix-spelling
@@ -0,0 +1,11 @@
+--- a/src/indentArgs.ml
++++ b/src/indentArgs.ml
+@@ -57,7 +57,7 @@ let options =
+ Arg.(value & flag & info ["i";"inplace"] ~doc)
+ in
+ let indent_empty =
+- let doc = "Return indent for empty lines, too. Especially usefull \
++ let doc = "Return indent for empty lines, too. Especially useful \
+ with $(--numeric)." in
+ Arg.(value & flag & info ["indent-empty"] ~doc)
+ in
diff --git a/debian/patches/let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT b/debian/patches/let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT
deleted file mode 100644
index 6979f94..0000000
--- a/debian/patches/let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: allow to build without ocamlopt
- Some platforms don't have ocamlopt. Allow upstream makefile to not build
- native targets in this case as controlled by the OCAML_HAVE_OCAMLOPT variable.
-Author: josch <j.schauer at email.de>
-Forwarded: https://github.com/OCamlPro/ocp-indent/issues/148
-
---- a/Makefile.simple
-+++ b/Makefile.simple
-@@ -9,7 +9,16 @@ COMPAT_DIR = src/ocaml_$(OCAML_MAJOR)/
-
- LIB = ocp-indent-lib
-
--all: $(LIB).cma $(LIB).cmxa $(LIB).cmxs
-+OCAML_HAVE_OCAMLOPT ?= yes
-+
-+TARGETS := $(LIB).cma
-+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-+ TARGETS += $(LIB).cmxa $(LIB).cmxs $(LIB).a
-+ SRCMETALASTLINE := 'archive(native) = "'$(LIB)'.cmxa"'
-+endif
-+
-+.PHONY: all
-+all: $(TARGETS)
-
- src/compat.ml: ALWAYS
- cp $(COMPAT_DIR)/compat.ml src/
-@@ -28,6 +37,9 @@ ALWAYS:
- %.cmxs: ALWAYS $(GENERATED)
- ocamlbuild src/$@
-
-+%.a: ALWAYS $(GENERATED)
-+ ocamlbuild src/$@
-+
- .PHONY: clean
- clean:
- rm -rf $(GENERATED) META _build
-@@ -36,15 +48,17 @@ _build/src/META:
- mkdir -p _build/src
- echo 'version = "'$(VERSION)'"' > $@
- echo 'archive(byte) = "'$(LIB)'.cma"' >> $@
-- echo 'archive(native) = "'$(LIB)'.cmxa"' >> $@
-+ echo $(SRCMETALASTLINE) >> $@
-
- INTERFACES = approx_lexer pos util indentConfig indentBlock indentPrinter nstream
-
-+IFEXP := $(INTERFACES:=.cmi) $(INTERFACES:=.mli)
-+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-+ IFEXP += $(INTERFACES:=.cmx)
-+endif
-+
- .PHONY: install
--install: _build/src/META $(LIB).cma $(LIB).cmxa
-+install: _build/src/META $(TARGETS)
- ocamlfind remove ${LIB} || true
- cd _build/src && ocamlfind install $(LIB) META \
-- $(INTERFACES:=.cmi) \
-- $(INTERFACES:=.mli) \
-- $(INTERFACES:=.cmx) \
-- $(LIB).cma $(LIB).cmxa $(LIB).cmxs $(LIB).a
-+ $(IFEXP) $(TARGETS)
diff --git a/debian/patches/remove-approx_common-from-Makefile.simple b/debian/patches/remove-approx_common-from-Makefile.simple
deleted file mode 100644
index d185d99..0000000
--- a/debian/patches/remove-approx_common-from-Makefile.simple
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: remove approx_common.ml from being generated
- Commit 845d6a68 removed src/approx_common.ml but did not adjust
- Makefile.simple or src/ocp-indent-lib.mllib
-Author: josch <j.schauer at email.de>
-Forwarded: https://github.com/OCamlPro/ocp-indent/issues/147
-
---- a/Makefile.simple
-+++ b/Makefile.simple
-@@ -1,6 +1,6 @@
- # -*- makefile -*-
-
--GENERATED = src/indentVersion.ml src/approx_common.ml src/compat.ml
-+GENERATED = src/indentVersion.ml src/compat.ml
-
- VERSION = $(shell awk -F'[(,)]' '/AC_INIT/ { print $$3 }' configure.ac)
-
-@@ -17,9 +17,6 @@ src/compat.ml: ALWAYS
- src/indentVersion.ml:
- echo 'let version = "'$(VERSION)'"' > $@
-
--src/approx_common.ml: src/approx_common.mli
-- cp $< $@
--
- ALWAYS:
-
- %.cma: ALWAYS $(GENERATED)
---- a/src/ocp-indent-lib.mllib
-+++ b/src/ocp-indent-lib.mllib
-@@ -1,4 +1,3 @@
--Approx_common
- Approx_tokens
- Approx_lexer
- Compat
diff --git a/debian/patches/series b/debian/patches/series
index 81aaf2b..1a20b91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,8 @@
-fix-Makefile.simple-syntax-error
-remove-approx_common-from-Makefile.simple
-let-Makefile.simple-respect-OCAML_HAVE_OCAMLOPT
+fix-Makefile.simple-install-target
+fix-Makefile.simple-libname
+fix-Makefile.simple-install-ocp-indent-bin
+fix-Makefile.simple-install-vim-emacs-indent
+fix-Makefile.simple-clean-symlinks
+fix-Makefile.simple-install-cmo-and-o
+fix-spelling
+fix-Makefile.simple-install-cmx
diff --git a/debian/rules b/debian/rules
index fee95b0..b83288e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,31 +6,14 @@ export DESTDIR := $(CURDIR)/debian/tmp
export OCAMLFIND_DESTDIR := $(DESTDIR)$(OCAML_STDLIB_DIR)
export OCAML_HAVE_OCAMLOPT
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
- INDENTMAIN = src/indentMain.native
-else
- INDENTMAIN = src/indentMain.byte
-endif
-
%:
dh $@ --with ocaml
override_dh_auto_clean:
- rm -f config.status config.log Makefile.config version.ocp
- rm -f $(INDENTMAIN) ocp-indent.1 src/approx_lexer.mli src/util.mli
- rm -f src/indentVersion.ml src/approx_common.ml src/compat.ml
- rm -rf _build
+ dh_auto_clean -- -f Makefile.simple
override_dh_auto_build:
- # build library
dh_auto_build -- -f Makefile.simple
- # build ocp-indent program
- ocamlbuild -use-ocamlfind -package findlib -package dynlink -package cmdliner $(INDENTMAIN)
- # build man page
- _build/$(INDENTMAIN) --help=groff > ocp-indent.1
- # create the mli for util.ml and approx_lexer.mll
- ocamlc -i src/util.ml > src/util.mli
- ocamlc -I _build/src -i _build/src/approx_lexer.ml > src/approx_lexer.mli
# skip because requires source directory to be git repository
override_dh_auto_test:
@@ -41,9 +24,6 @@ override_dh_install:
override_dh_auto_install:
mkdir -p $(OCAMLFIND_DESTDIR)
mkdir -p $(DESTDIR)/usr/bin
- cp _build/$(INDENTMAIN) $(DESTDIR)/usr/bin/ocp-indent
mkdir -p $(DESTDIR)/usr/share/emacs/site-lisp
- cp tools/ocp-indent.el $(DESTDIR)/usr/share/emacs/site-lisp/ocp-indent.el
mkdir -p $(DESTDIR)/usr/share/ocp-indent/vim/indent
- cp tools/ocp-indent.vim $(DESTDIR)/usr/share/ocp-indent/vim/indent/ocaml.vim
dh_auto_install -- -f Makefile.simple
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.git
More information about the Pkg-ocaml-maint-commits
mailing list