The following commit has been merged in the master branch:
commit 0b076b63ae1d84c485a3b91959f1e26a00e0c8e9
Author: Mehdi Dogguy <me...@dogguy.org>
Date: Wed Dec 14 14:14:31 2011 +0100
Various (packaging) changes
diff --git a/debian/META.in b/debian/META.in
new file mode 100644
index 0000000..ea49d2a
--- /dev/null
+++ b/debian/META.in
@@ -0,0 +1,5 @@
+requires = ""
+description = "Alt-Ergo library"
+archive(byte) = "altErgo.cmo"
+archive(native) = "altErgo.cmx"
+version = "@VERSION@"
diff --git a/debian/alt-ergo.dirs b/debian/alt-ergo.dirs.in
similarity index 66%
rename from debian/alt-ergo.dirs
rename to debian/alt-ergo.dirs.in
index ed1537f..f7c6ccc 100644
--- a/debian/alt-ergo.dirs
+++ b/debian/alt-ergo.dirs.in
@@ -1,3 +1,3 @@
usr/bin
-usr/lib/alt-ergo
+@OCamlStdlibDir@/alt-ergo
usr/share/gtksourceview-2.0/language-specs
diff --git a/debian/rules b/debian/rules
index 3f377a6..cafc500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,21 +5,21 @@
include /usr/share/ocaml/ocamlvars.mk
-OCAML_RUNTIME_NOX = $(if $(OCAML_OPT_ARCH),,ocaml-base-nox-$(OCAML_ABI))
-MAKEOPTS = OCAMLC=ocamlc OCAMLOPT=ocamlopt OCAMLLEX=ocamllex
OCAMLLIB=$(OCAML_STDLIB_DIR) OCAMLVERSION=$(OCAML_ABI)
-BACKUP = version.ml .depend
+BACKUP=.depend
+VERSION=$(shell dpkg-parsechangelog| sed -n "s/Version: //p")
override_dh_auto_configure:
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
+ --libdir=$(OCAML_STDLIB_DIR)/alt-ergo \
--mandir=\$${prefix}/share/man
override_dh_auto_build:
for i in $(BACKUP); do \
cp -ax $$i $$i.debian; \
done
- $(MAKE) $(OCAML_BEST) altgr-ergo
+ $(MAKE) all altgr-ergo.$(OCAML_BEST)
override_dh_auto_clean:
if [ -f Makefile ]; then \
@@ -30,10 +30,12 @@ override_dh_auto_clean:
done
override_dh_auto_install:
- cp -f alt-ergo.$(OCAML_BEST) $(CURDIR)/debian/alt-ergo/usr/bin/alt-ergo
- cp -f altgr-ergo.$(OCAML_BEST)
$(CURDIR)/debian/alt-ergo/usr/bin/altgr-ergo
- cp -f smt_prelude.mlw $(CURDIR)/debian/alt-ergo/usr/lib/alt-ergo
- cp -f util/gtk-lang/alt-ergo.lang
$(CURDIR)/debian/alt-ergo/usr/share/gtksourceview-2.0/language-specs/alt-ergo.lang
+ $(MAKE) BINDIR=$(CURDIR)/debian/alt-ergo/usr/bin \
+ LIBDIR=$(CURDIR)/debian/alt-ergo/$(OCAML_STDLIB_DIR)/alt-ergo \
+ MANDIR=$(CURDIR)/debian/alt-ergo/usr/share/man \
+ prefix=$(CURDIR)/debian/alt-ergo/usr \
+ install-$(OCAML_BEST) install-gui install-pack-$(OCAML_BEST)
+ sed "s/@VERSION@/$(VERSION)/" debian/META.in >
$(CURDIR)/debian/alt-ergo/$(OCAML_STDLIB_DIR)/alt-ergo/META
%:
dh --with quilt,ocaml $@
--
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
