[Pkg-ocaml-maint-commits] [SCM] lablgtk-extras packaging branch, master, updated. debian/1.0-1-10-gadd9c10

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 752029795033b94760ee17c30657299167bd3d6c
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 26 07:38:23 2013 +0200

    Update packaging

diff --git a/debian/control b/debian/control
index 7a4b59c..ff7b3e1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,12 @@ Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 8),
  dh-ocaml (>= 0.9),
- liblablgtk2-ocaml-dev,
+ liblablgtk2-ocaml-dev (>= 2.16.0+dfsg-1~exp3),
  liblablgtksourceview2-ocaml-dev,
  libconfig-file-ocaml-dev,
- libxml-light-ocaml-dev,
+ libxmlm-ocaml-dev,
  camlp4,
+ ocaml-findlib,
  ocaml-nox
 Standards-Version: 3.9.2
 Section: ocaml
diff --git a/debian/rules b/debian/rules
index c3b2843..e5ee609 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DESTDIR=$(CURDIR)/debian/tmp
+include /usr/share/ocaml/ocamlvars.mk
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-	$(MAKE) MY_INCLUDES="-I +config-file -I +xml-light"
-
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR)
 	dh_auto_install
-	rmdir debian/tmp/usr/bin
-	rmdir debian/tmp/usr/share/lablgtk-extras
 	mkdir -p debian/tmp/usr/share/doc/liblablgtk-extras-ocaml-dev/html
 	cp -a src/ocamldoc debian/tmp/usr/share/doc/liblablgtk-extras-ocaml-dev/html/api
 
@@ -22,5 +21,4 @@ override_dh_install:
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf src/install.ml src/version.ml src/ocamldoc
+	if [ -x config.status ]; then dh_auto_clean; fi

-- 
lablgtk-extras packaging