[Pkg-ocaml-maint-commits] r3505 - in /trunk/packages/ocamldap/trunk/debian: changelog compat control control.in libldap-ocaml-dev.dirs libldap-ocaml-dev.dirs.in rules watch

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Sun Jan 7 23:04:33 CET 2007 

Author: gildor
Date: Sun Jan  7 23:04:32 2007
New Revision: 3505

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3505
Log:
[copy and paste changelog]
* Upgrade debian/watch version to 3,
* Upgrade debhelper debian/compat to 5,
* Use CDBS for debian/rules,
* Suppress dependency on libldap2-dev and chrpath, since package
  doesn't depend on it anymore,
-- SLG

Added:
    trunk/packages/ocamldap/trunk/debian/control.in
      - copied, changed from r3272, trunk/packages/ocamldap/trunk/debian/control
    trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in
      - copied, changed from r3272, trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs
Removed:
    trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs
Modified:
    trunk/packages/ocamldap/trunk/debian/changelog
    trunk/packages/ocamldap/trunk/debian/compat
    trunk/packages/ocamldap/trunk/debian/control
    trunk/packages/ocamldap/trunk/debian/rules
    trunk/packages/ocamldap/trunk/debian/watch

Modified: trunk/packages/ocamldap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/changelog?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/changelog (original)
+++ trunk/packages/ocamldap/trunk/debian/changelog Sun Jan  7 23:04:32 2007
@@ -1,3 +1,13 @@
+ocamldap (2.1.8-3) UNRELEASED; urgency=low
+
+  * Upgrade debian/watch version to 3,
+  * Upgrade debhelper debian/compat to 5,
+  * Use CDBS for debian/rules,
+  * Suppress dependency on libldap2-dev and chrpath, since package 
+    doesn't depend on it anymore,
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon,  6 Nov 2006 23:41:00 +0100
+
 ocamldap (2.1.8-2) unstable; urgency=low
 
   * Removed control.in as per new ocaml policy.

Modified: trunk/packages/ocamldap/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/compat?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/compat (original)
+++ trunk/packages/ocamldap/trunk/debian/compat Sun Jan  7 23:04:32 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/ocamldap/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/control?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/control (original)
+++ trunk/packages/ocamldap/trunk/debian/control Sun Jan  7 23:04:32 2007
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org> 
-Build-Depends: ocaml-nox (>= 3.09.2), debhelper (>= 4), libldap2-dev, chrpath, dpatch (>=1.11), ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldap
 
 Package: libldap-ocaml-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Depends: ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
 Description: LDAP bindings for OCaml 
  It supports the core ldap-client functions, including search, add,
  modify, and delete.

Copied: trunk/packages/ocamldap/trunk/debian/control.in (from r3272, trunk/packages/ocamldap/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/control.in?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/control (original)
+++ trunk/packages/ocamldap/trunk/debian/control.in Sun Jan  7 23:04:32 2007
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org> 
-Build-Depends: ocaml-nox (>= 3.09.2), debhelper (>= 4), libldap2-dev, chrpath, dpatch (>=1.11), ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Build-Depends: @cdbs@, ocaml-findlib, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldap
 
 Package: libldap-ocaml-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
+Depends: ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 0.98), libssl-ocaml-dev
 Description: LDAP bindings for OCaml 
  It supports the core ldap-client functions, including search, add,
  modify, and delete.

Copied: trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in (from r3272, trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs (original)
+++ trunk/packages/ocamldap/trunk/debian/libldap-ocaml-dev.dirs.in Sun Jan  7 23:04:32 2007
@@ -1,1 +1,2 @@
+ at OCamlStdlibDir@
 usr/share/doc/libldap-ocaml-dev/html

Modified: trunk/packages/ocamldap/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/rules?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/rules (original)
+++ trunk/packages/ocamldap/trunk/debian/rules Sun Jan  7 23:04:32 2007
@@ -1,98 +1,150 @@
 #!/usr/bin/make -f
+# debian/rules for ocamldap package
+# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
-include /usr/share/dpatch/dpatch.make 
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-OCAMLIBDIR=$(shell ocamlc -where)
-PACKAGE=ocamldap
-DESTDIR_DEV=$(CURDIR)/debian/libldap-ocaml-dev/
-OCAMLABI=$(shell ocamlc -version)
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
+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
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+PACKAGE_DEV := libldap-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
-configure: ocamlinit configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+DEB_MAKE_CLEAN_TARGET    := clean
 
-build-arch: build-arch-stamp
-build-arch-stamp: configure
-	dh_testdir
-	$(MAKE) 
-	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-		$(MAKE) opt;\
-	fi
-	touch build-arch-stamp
+DEB_MAKE_BUILD_TARGET    := all 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    += opt 
+endif
 
-build-indep: build-indep-stamp
-build-indep-stamp: configure
-	dh_testdir
-	touch build-indep-stamp
+DEB_MAKE_INSTALL_TARGET  := install \
+  OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-build: build-stamp
-build-stamp: patch-stamp build-arch build-indep
-	touch build-stamp
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp build-stamp
-	-$(MAKE) clean
-	-$(RM) varcc.cmo varcc.cmi varcc
-	dh_clean
+clean::
+	-$(RM) $(CURDIR)/varcc.cmo 
+	-$(RM) $(CURDIR)/varcc.cmi 
+	-$(RM) $(CURDIR)/varcc 
+	-$(RM) $(CURDIR)/debian/libldap-ocaml-dev.dirs
 
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-		
-	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+install/libldap-ocaml-dev::
+	ocamlfind ocamldoc -package ssl -html -d \
+	  $(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/ *.mli
 
-	$(MAKE) install \
-	  OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir \
-	  $(DESTDIR_DEV)/$(OCAMLIBDIR)"
-			   
-	ocamlfind ocamldoc -package ssl -html -d \
-	$(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/ *.mli
-	  
-install-indep: DH_OPTIONS=
-install-indep: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-binary-indep: build install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs Changelog -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs Changelog -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+##!/usr/bin/make -f
+#
+#include /usr/share/dpatch/dpatch.make 
+#
+#OCAMLIBDIR=$(shell ocamlc -where)
+#PACKAGE=ocamldap
+#DESTDIR_DEV=$(CURDIR)/debian/libldap-ocaml-dev/
+#OCAMLABI=$(shell ocamlc -version)
+#OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
+#
+#ocamlinit:
+#	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+#
+#configure: ocamlinit configure-stamp
+#configure-stamp:
+#	dh_testdir
+#	touch configure-stamp
+#
+#build-arch: build-arch-stamp
+#build-arch-stamp: configure
+#	dh_testdir
+#	$(MAKE) 
+#	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
+#		$(MAKE) opt;\
+#	fi
+#	touch build-arch-stamp
+#
+#build-indep: build-indep-stamp
+#build-indep-stamp: configure
+#	dh_testdir
+#	touch build-indep-stamp
+#
+#build: build-stamp
+#build-stamp: patch-stamp build-arch build-indep
+#	touch build-stamp
+#
+#clean: unpatch
+#	dh_testdir
+#	dh_testroot
+#	rm -f build-arch-stamp build-indep-stamp build-stamp
+#	-$(MAKE) clean
+#	-$(RM) varcc.cmo varcc.cmi varcc
+#	dh_clean
+#
+#install: DH_OPTIONS=
+#install: build
+#	dh_testdir
+#	dh_testroot
+#	dh_clean -k
+#	dh_installdirs
+#		
+#	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+#
+#	$(MAKE) install \
+#	  OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir \
+#	  $(DESTDIR_DEV)/$(OCAMLIBDIR)"
+#			   
+#	ocamlfind ocamldoc -package ssl -html -d \
+#	$(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/ *.mli
+#	  
+#install-indep: DH_OPTIONS=
+#install-indep: build
+#	dh_testdir
+#	dh_testroot
+#	dh_clean -k
+#	dh_installdirs
+#
+#binary-indep: build install-indep
+#	dh_testdir -i
+#	dh_testroot -i
+#	dh_installdocs -i
+#	dh_installexamples -i
+#	dh_installchangelogs Changelog -i
+#	dh_compress -i
+#	dh_fixperms -i
+#	dh_installdeb -i
+#	dh_gencontrol -i
+#	dh_md5sums -i
+#	dh_builddeb -i
+#
+#binary-arch: build install
+#	dh_testdir -a
+#	dh_testroot -a
+#	dh_installdocs -a
+#	dh_installexamples -a
+#	dh_installchangelogs Changelog -a
+#	dh_strip -a
+#	dh_link -a
+#	dh_compress -a
+#	dh_fixperms -a
+#	dh_installdeb -a
+#	dh_shlibdeps -a
+#	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
+#	dh_md5sums -a
+#	dh_builddeb -a
+#
+#binary: binary-arch
+#.PHONY: build clean binary-indep binary-arch binary install ocamlinit

Modified: trunk/packages/ocamldap/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/watch?rev=3505&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/watch (original)
+++ trunk/packages/ocamldap/trunk/debian/watch Sun Jan  7 23:04:32 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://prdownloads.sourceforge.net/ocamldap/ocamldap-([0-9\.]*).tar.bz2

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