[Pkg-ocaml-maint-commits] [SCM] camlidl packaging branch, master, updated. debian/1.05-10-11-g7786d1c

[Samuel Mimram]

The following commit has been merged in the master branch:
commit caa6b88bf4e9745e14d55d69cc476a87bd00caf7
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Tue Feb 24 18:13:34 2009 +0100

    Update control.

diff --git a/debian/control b/debian/control
index e3196d9..d436718 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:  Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, cpp, binutils
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.23-1.1), dpatch, ocaml-nox (>= 3.11), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, debhelper (>= 7), cpp, binutils
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlidl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlidl.git
 
@@ -23,4 +23,3 @@ Description: Stub code generator for Objective Caml
  long as those languages have a well-defined C interface.
  .
  This package contains the CamlIDL executable.
-
diff --git a/debian/control.in b/debian/control.in
index c3a8c76..e476113 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,8 +5,8 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: @OCamlTeam@
 Build-Depends: @cdbs@, debhelper (>= 7), cpp, binutils
 Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlidl/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlidl.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlidl.git
 
 Package: camlidl
 Section: devel
diff --git a/debian/patches/37_make.dpatch b/debian/patches/37_make.dpatch
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index d7a7238..35732fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,16 +23,16 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 include $(CURDIR)/debian/mk/docbook-manpage.mk
 
 PACKAGE := camlidl
 DESTDIR := $(CURDIR)/debian/$(PACKAGE)
 
 DEB_MAKE_CLEAN_TARGET    := clean
-DEB_MAKE_BUILD_TARGET    := all 
+DEB_MAKE_BUILD_TARGET    := all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET    += opt 
+DEB_MAKE_BUILD_TARGET    += opt
 endif
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR="$(DESTDIR)"
 
@@ -45,9 +45,9 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/camlidl.xml
 DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 clean::
-	-$(RM) $(CURDIR)/lib/com.cmxa 
-	-$(RM) $(CURDIR)/lib/com.a 
-	-$(RM) $(CURDIR)/lib/com.o 
+	-$(RM) $(CURDIR)/lib/com.cmxa
+	-$(RM) $(CURDIR)/lib/com.a
+	-$(RM) $(CURDIR)/lib/com.o
 	-$(RM) $(CURDIR)/debian/camlidl.dirs
 	-$(RM) $(CURDIR)/debian/camlidl.install
 	-$(RM) $(CURDIR)/debian/META.camlidl

-- 
camlidl packaging