[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-2-1-gb154305

Stephane Glondu steph at glondu.net
Sun Jul 26 17:25:16 UTC 2009 

The following commit has been merged in the master branch:
commit b1543052c3f6f8f4ecff79a4355b16ff27030ae6
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 26 19:23:01 2009 +0200

    Adapt to new dh-ocaml, switch debian/rules to dh

diff --git a/debian/changelog b/debian/changelog
index 07d57e2..ad35635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lablgl (1.04-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - adapt to new dh-ocaml
+    - move to section ocaml
+    - update Standards-Version to 3.8.2
+  * debian/rules: switch to dh
+
+ -- Stephane Glondu <steph at glondu.net>  Sun, 26 Jul 2009 19:23:26 +0200
+
 lablgl (1.04-2) unstable; urgency=low
 
   [ Stephane Glondu ]
diff --git a/debian/clean b/debian/clean
index df638bb..8bf4c72 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
-debian/liblablgl-ocaml-dev.doc-base.ocamldoc-apiref
 src/build.ml
+Makefile.config
+lablgl.1
diff --git a/debian/control b/debian/control
index a31a978..89de9df 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: lablgl
-Section: libdevel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
@@ -25,8 +25,8 @@ Build-Depends:
  libxml2-utils,
  xsltproc,
  camlp4 (>= 3.11),
- dh-ocaml
-Standards-Version: 3.8.0
+ dh-ocaml (>= 0.9)
+Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgl.git
 
@@ -51,9 +51,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgl.git
 
 Package: liblablgl-ocaml
 Architecture: any
-Section: libs
-Depends: ocaml-base-${F:OCamlABI}, ${shlibs:Depends}
-Conflicts: lablgl (<< 0.97-2)
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: Runtime libraries for lablgl
  LablGL is an OpenGL interface for Objective Caml. Since it includes
  support for the Togl widget, you can comfortably use it with LablTk.
@@ -64,12 +66,17 @@ Description: Runtime libraries for lablgl
 
 Package: liblablgl-ocaml-dev
 Architecture: any
-Section: libdevel
-Depends: liblablgl-ocaml (= ${binary:Version}), ocaml-${F:OCamlABI}, libgl1-mesa-dev|xlibmesa-dev(<<4.2.1-5)|libgl-dev, libglu1-mesa-dev|xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev, libxmu-dev, freeglut3-dev
-Conflicts: lablgl, findlib (<< 1.0.2)
-Replaces: lablgl
-Provides: lablgl
+Depends:
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev,
+ tk8.4-dev,
+ libxmu-dev,
+ freeglut3-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: an OpenGL interface for Objective Caml
- LablGL gives access to OpenGL interface from Objective Caml. Since it 
- includes support for the Togl widget, you can comfortably use it with 
+ LablGL gives access to OpenGL interface from Objective Caml. Since it
+ includes support for the Togl widget, you can comfortably use it with
  LablTk. A GtkGlarea binding for use with lablgtk is also provided.
diff --git a/debian/liblablgl-ocaml-dev.ocamldoc.in b/debian/liblablgl-ocaml-dev.ocamldoc.in
new file mode 100644
index 0000000..cb7bcad
--- /dev/null
+++ b/debian/liblablgl-ocaml-dev.ocamldoc.in
@@ -0,0 +1 @@
+-I @OCamlStdlibDir@/labltk -no-custom-tags
diff --git a/debian/rules b/debian/rules
index 40eb59b..dbc8888 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,20 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 by Joey Hess.
+# -*- makefile -*-
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cp debian/Makefile.config .
-	touch configure-stamp
+%:
+	dh --with ocaml $@
 
-build: ocamlinit build-stamp
-build-stamp: configure-stamp
-	dh_testdir
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	cp debian/Makefile.config .
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE)
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) opt
@@ -30,81 +27,15 @@ endif
 	  -o $(CURDIR)/  /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 	  $(CURDIR)/debian/xml-man/en/lablgl.xml
 
-	touch build-stamp
-
-clean: ocamlinit-clean
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
 	[ ! -f "$(CURDIR)/Makefile" ] || [ ! -f "$(CURDIR)/Makefile.config" ] || $(MAKE) clean
-	-$(RM) "$(CURDIR)/lablgl.1"
-	-$(RM) "$(CURDIR)/debian/liblablgl-ocaml-dev.dirs"
-	-$(RM) "$(CURDIR)/debian/liblablgl-ocaml.dirs"
-	-$(RM) "$(CURDIR)/debian/liblablgl-ocaml.files"
-
-	dh_clean Makefile.config
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
 
-	# Add here commands to install the package into
-	# debian/liblablgl-ocaml-dev
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	$(MAKE) install									\
 		LIBDIR=$(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_STDLIB_DIR)		\
 		DLLDIR=$(CURDIR)/debian/liblablgl-ocaml$(OCAML_STDLIB_DIR)/stublibs	\
 		BINDIR=$(CURDIR)/debian/liblablgl-ocaml-dev/usr/bin
-
 	cp debian/META $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_STDLIB_DIR)/lablgl
 	ln -sf $(OCAML_STDLIB_DIR)/lablgl $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_STDLIB_DIR)/lablGL
-
-	# Doc generation (TODO: use CDBS)
-	for i in liblablgl-ocaml-dev; do \
-	  mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
-	  OCAMLDOC_INCLUDE=`find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \;`; \
-	  find debian/$$i/$(OCAML_STDLIB_DIR)/ \
-	    -type f -name '*.mli' -or -name '*.ml' \
-	    | xargs $(OCAML_OCAMLDOC) -I $(OCAML_STDLIB_DIR)/labltk \
-	     -stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
-	     -d debian/$$i/usr/share/doc/$$i/html/api \
-            || true; \
-	    sed -e "s/@PACKAGE@/$$i/g" \
-	     /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
-	     > debian/$$i.doc-base.ocamldoc-apiref ; \
-	done
-
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -s
-	dh_testroot -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installmenu -s
-	dh_installcron -s
-	dh_installman -s
-	dh_installinfo -s
-	dh_installchangelogs CHANGES -s
-	dh_strip -s
-	dh_link -s
-#	dh_ocamlld -pliblablgl-ocaml
-	dh_compress -s
-	dh_fixperms -s
-#	dh_makeshlibs -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-srch binary install configure

-- 
lablgl packaging

More information about the Pkg-ocaml-maint-commits mailing list