[Pkg-ocaml-maint-commits] [SCM] lablgtk2 packaging branch, master, updated. debian/2.12.0-1-8-g64b4653

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 64b465397b58a7abfbc71f5f0acb4f7c1bc5e795
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 26 23:32:42 2009 +0100

    Rebuild with OCaml 3.11.

diff --git a/debian/changelog b/debian/changelog
index 6299649..c1bca57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-lablgtk2 (2.12.0-2) UNRELEASED; urgency=low
+lablgtk2 (2.12.0-2) unstable; urgency=low
 
   [ Stephane Glondu ]
-  * Remove various versioned dependencies
-  * Switch packaging to git
+  * Remove various versioned dependencies.
+  * Switch packaging to git.
 
   [ Samuel Mimram ]
+  * Rebuild with OCaml 3.11.
   * Use dh-ocaml predefined variables in rules.
   * Use native version of ocamldoc if available.
 
- -- Samuel Mimram <smimram at debian.org>  Fri, 20 Feb 2009 10:37:41 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu, 26 Feb 2009 23:29:27 +0100
 
 lablgtk2 (2.12.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index bcc4ee6..6869ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,13 @@ Uploaders:
 Build-Depends:
  debhelper (>> 7.0.0),
  dh-ocaml (>= 0.3),
- ocaml,
- camlp4,
+ ocaml (>= 3.11),
+ camlp4 (>= 3.11),
+ liblablgl-ocaml-dev (>= 1.04),
  libncurses5-dev,
  libgtk2.0-dev,
  libgtkgl2.0-dev,
  libglade2-dev,
- liblablgl-ocaml-dev,
  librsvg2-dev,
  libgnomecanvas2-dev,
  libgtkspell-dev,
diff --git a/debian/rules b/debian/rules
index 202e8fc..473c99e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,9 +37,9 @@ build-stamp: patch-stamp configure-stamp
 
 	$(MAKE) depend
 	$(MAKE)
-	if [ -x /usr/bin/ocamlopt ]; then \
-	    $(MAKE) opt; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) opt
+endif
 
 	touch build-stamp
 
@@ -52,6 +52,7 @@ clean: unpatch
 	-$(RM) config.status
 	-$(RM) config.log
 	-$(RM) $(OCAML_IN_FILES)
+	-$(RM) $(wildcard debian/*.ocamldoc-apiref)
 
 	dh_clean config.make
 
@@ -93,12 +94,12 @@ binary-arch: build install
 	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas' --exclude='GL' --exclude='sourceview'
 	dh_installmenu -s
 	dh_movefiles -s
-	dh_install -s --sourcedir=$(DESTDIR) --list-missing -X ".cmx" -X ".cmxa" -X "*.o"
-	if [ -x /usr/bin/ocamlopt ]; then \
-	  mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.cmx  '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'; \
-	  mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.cmxa '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'; \
-	  mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.o    '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'; \
-	fi
+	dh_install -s --list-missing -X ".cmx" -X ".cmxa" -X "*.o"
+ifneq ($(OCAML_OPT_ARCH),)
+	mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.cmx  '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'
+	mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.cmxa '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'
+	mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.o    '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'
+endif
 	# Doc generation (TODO: use CDBS)
 	OCAMLDOC_PKG="liblablgtk2-ocaml-dev liblablgtk2-gl-ocaml-dev liblablgtk2-gnome-ocaml-dev liblablgtksourceview-ocaml-dev"; \
 	OCAMLDOC_INCLUDE=`for i in $$OCAMLDOC_PKG; do find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \; ; done`; \

-- 
lablgtk2 packaging