[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.11.0-3-23-g34a742d

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit be87650240aeeb6124a96300a811a2667aeb40d7
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue Jul 7 20:29:30 2009 +0200

    Use ocamlinit sed rule to generate links for opt programs

diff --git a/debian/changelog b/debian/changelog
index 7d1fb74..a6c66cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ jocaml (3.11.1-1) UNRELEASED; urgency=low
     toploop.cmi. Theses changes allow findlib to work with JoCaml without
     recompiling it (Closes: #532970).
   * Tools addlabels and scrapelabels are not installed by upstream anymore
+  * Use ocamlinit sed rule to generate links for opt programs
   * New JoCaml standard library location is: /usr/lib/jocaml/
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 23 Jun 2009 17:51:44 +0200
diff --git a/debian/jocaml.links.in b/debian/jocaml.links.in
new file mode 100644
index 0000000..f23f0d4
--- /dev/null
+++ b/debian/jocaml.links.in
@@ -0,0 +1,4 @@
+OPT: usr/share/man/man1/jocamlc.1.gz     usr/share/man/man1/jocamlc.opt.1.gz
+OPT: usr/share/man/man1/jocamlopt.1.gz   usr/share/man/man1/jocamlopt.opt.1.gz
+OPT: usr/share/man/man1/jocamllex.1.gz   usr/share/man/man1/jocamllex.opt.1.gz
+OPT: usr/share/man/man1/jocamldep.1.gz   usr/share/man/man1/jocamldep.opt.1.gz
diff --git a/debian/jocaml.links.opt b/debian/jocaml.links.opt
deleted file mode 100644
index 677fd14..0000000
--- a/debian/jocaml.links.opt
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/man/man1/jocamlc.1.gz     usr/share/man/man1/jocamlc.opt.1.gz
-usr/share/man/man1/jocamlopt.1.gz   usr/share/man/man1/jocamlopt.opt.1.gz
-usr/share/man/man1/jocamllex.1.gz   usr/share/man/man1/jocamllex.opt.1.gz
-usr/share/man/man1/jocamldep.1.gz   usr/share/man/man1/jocamldep.opt.1.gz
diff --git a/debian/rules b/debian/rules
index 120d2b8..c843fc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,6 @@ override_dh_auto_clean: ocamlinit-clean
         fi
 
 override_dh_auto_install:
-ifdef JOCAML_OPT_ARCH
-	cp debian/jocaml.links.opt debian/jocaml.links
-endif
 	mkdir -p $(CURDIR)/debian/tmp/usr
 	$(MAKE) PREFIX=$(CURDIR)/debian/tmp/usr LIBDIR=$(CURDIR)/debian/tmp/$(JOCAML_STDLIB_DIR) install
 	mv $(CURDIR)/debian/tmp/$(JOCAML_STDLIB_DIR)/toploop.cmi $(CURDIR)/debian/jocaml/$(JOCAML_STDLIB_DIR)/jocamltoploop/

-- 
jocaml packaging