[Pkg-ocaml-maint-commits] [SCM] ledit packaging branch, master, updated. debian/2.01-4-3-g499e78a

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 499e78a4a6acd5ac55b1f8673e2bfddc2059a3fc
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 15:07:18 2009 +0200

    Various changes

diff --git a/debian/changelog b/debian/changelog
index 6adb450..f338f28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
 ledit (2.01-5) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * debian/control:
     - update my e-mail address and remove DMUA
     - update Standards-Version to 3.8.3 (no changes)
 
- -- Stéphane Glondu <glondu at debian.org>  Tue, 08 Sep 2009 23:18:37 +0200
+  [ Mehdi Dogguy ]
+  * Add myself to uploaders
+  * Simplify debian/rules
+    - Use debian/clean
+    - Use dh_ocamldoc (Closes: #549718)
+    - Use dh_ocaml
+   * Add dh_ocaml variables ${misc:Depends} in debian/control
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 15:05:26 +0200
 
 ledit (2.01-4) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
index 12ec2d4..da74cdf 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,5 @@
 debian/libledit-ocaml-dev.doc-base.ocamldoc-apiref
+META
+ledit.a
+ledit.cma
+ledit.cmxa
diff --git a/debian/control b/debian/control
index c40ac09..d1c32a0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,11 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Stefano Zacchiroli <zack at debian.org>,
  Stéphane Glondu <glondu at debian.org>,
+ Mehdi Dogguy <mehdi at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
 Build-Depends:
  debhelper (>> 7.0.0),
- dh-ocaml,
+ dh-ocaml (>= 0.9~),
  dpatch,
  ocaml-nox,
  camlp5 (>= 5.12)
@@ -20,7 +21,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ledit.git
 
 Package: ledit
 Architecture: all
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
 Provides: readline-editor
 Description: line editor for interactive programs
  Ledit is a line editor, allowing to use control commands like in emacs
@@ -30,9 +34,14 @@ Description: line editor for interactive programs
 Package: libledit-ocaml-dev
 Architecture: any
 Section: ocaml
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
+Depends:
+ ${ocaml:Depends},
+ ocaml-findlib,
  camlp5,
+ ${shlib:Depends},
  ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: OCaml line editor library
  Ledit is a line editor, allowing to use control commands like in emacs
  or in shells (bash, tcsh). To be used with interactive commands. It is
diff --git a/debian/libledit-ocaml-dev.ocamldoc b/debian/libledit-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..8b4e2c0
--- /dev/null
+++ b/debian/libledit-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+-I `camlp5 -where` -pp "camlp5r -I ext" -html
diff --git a/debian/rules b/debian/rules
index bccc217..e4541d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR = $(CURDIR)/debian/ledit
 LEDIT_LIBDIR = $(CURDIR)/debian/libledit-ocaml-dev/$(OCAML_STDLIB_DIR)/ledit
-LEDIT_APIDOCDIR = $(CURDIR)/debian/libledit-ocaml-dev/usr/share/doc/libledit-ocaml-dev/html/api
 
 #export DH_VERBOSE=1
 
@@ -24,9 +23,7 @@ build-stamp: patch-stamp
 clean:  unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
 	$(MAKE) clean
-	rm -f META ledit.a ledit.cma ledit.cmxa
 	dh_clean
 
 install-indep: build
@@ -35,7 +32,6 @@ install-indep: build
 	dh_prep -i
 	dh_installdirs -i
 	$(MAKE) install BINDIR=$(DESTDIR)/usr/bin MANDIR=$(DESTDIR)/usr/share/man/man1
-	-cp debian/lintian.overrides $(CURDIR)/debian/ledit/usr/share/lintian/overrides/ledit
 
 install-arch: build
 	dh_testdir -s
@@ -45,9 +41,7 @@ install-arch: build
 	mkdir -p $(LEDIT_LIBDIR)
 	$(MAKE) install-lib LIBDIR=$(LEDIT_LIBDIR)
 	dh_install -s
-	mkdir -p $(LEDIT_APIDOCDIR)
-	ocamldoc -I `camlp5 -where` -pp "camlp5r -I ext" *.mli -html -d $(LEDIT_APIDOCDIR)
-	/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate libledit-ocaml-dev
+	dh_ocamldoc
 
 binary-indep: build install-indep
 	dh_testdir -i
@@ -63,7 +57,8 @@ binary-indep: build install-indep
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
-	dh_gencontrol -i -- -VF:OCamlABI="$(OCAML_ABI)"
+	dh_ocaml -i
+	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -80,7 +75,8 @@ binary-arch: build install-arch
 	dh_fixperms -s
 	dh_installdeb -s
 	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
+	dh_ocaml -s
+	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s
 

-- 
ledit packaging