[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-2-1-gcb48335

[Stephane Glondu]

The following commit has been merged in the master branch:
commit cb483354023c317f2d075dd2c18294f49ebcccc5
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Oct 29 14:23:18 2009 +0100

    Switch packaging to dh-ocaml 0.9

diff --git a/debian/changelog b/debian/changelog
index f8c33ee..a688fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nurpawiki (1.2.3-3) UNRELEASED; urgency=low
+
+  * Switch packaging to dh-ocaml 0.9
+  * Change build-dependency from ocsigen-dev to libocsigen-ocaml-dev,
+    and add explicit dependency to ocaml for the binary package
+
+ -- Stéphane Glondu <glondu at debian.org>  Thu, 29 Oct 2009 13:56:51 +0100
+
 nurpawiki (1.2.3-2) unstable; urgency=low
 
   * Add some patches:
diff --git a/debian/control b/debian/control
index 36dd1af..aaa0676 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Priority: extra
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7.0.52),
+ debhelper (>= 7.2.11~),
  quilt (>= 0.46-7~),
- dh-ocaml,
- ocsigen-dev (>= 1.2.0),
- libcalendar-ocaml-dev,
- libextlib-ocaml-dev,
- libpostgresql-ocaml-dev (>= 1.12.1),
- ocaml-nox (>= 3.11)
+ dh-ocaml (>= 0.9~),
+ libocsigen-ocaml-dev,
+ libcalendar-ocaml-dev (>= 2.01.1-6~),
+ libextlib-ocaml-dev (>= 1.5.1-5~),
+ libpostgresql-ocaml-dev (>= 1.12.1-2~),
+ ocaml-nox (>= 3.11.1-3~)
 Standards-Version: 3.8.3
 Section: web
 Homepage: http://code.google.com/p/nurpawiki/
@@ -20,13 +20,10 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git
 Package: nurpawiki
 Architecture: any
 Depends:
+ ocsigen,
+ ${ocaml:Depends},
  ${shlibs:Depends},
- ${misc:Depends},
- ocaml-base-nox-${F:OCamlABI},
- libcalendar-ocaml (>= 2.01.1-4~),
- libextlib-ocaml (>= 1.5.1-4~),
- libpostgresql-ocaml (>= 1.12.1),
- ocsigen (>= 1.1.0)
+ ${misc:Depends}
 Suggests:
  postgresql
 Description: Wiki with integrated to-do list and scheduler
diff --git a/debian/rules b/debian/rules
index 42d9a65..73e7374 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 
 # For ocamlfind
 export OCAMLFIND_DESTDIR := debian/nurpawiki/usr/lib/ocsigen
 
 %:
-	dh --with quilt $@
+	dh --with quilt,ocaml $@
 
 .PHONY: override_dh_auto_build
-override_dh_auto_build: ocamlinit
+override_dh_auto_build:
 	make
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	make nurpawiki.cmxs
@@ -25,13 +25,6 @@ override_dh_install:
 	dh_install
 # Fix ugly permissions
 	chmod 644 debian/nurpawiki/usr/share/ocsigen/nurpawiki/*.png
-# Small hack to prevent a runtime dependency on libpcre-ocaml which is
-# statically linked in ocsigen
-	sed -i 's/,pcre//' $(OCAMLFIND_DESTDIR)/nurpawiki/META
-
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean: ocamlinit-clean

-- 
nurpawiki packaging