[Pkg-ocaml-maint-commits] r3504 - in /trunk/packages/ocaml-fileutils/trunk/debian: changelog compat control control.in libfileutils-ocaml-dev.dirs libfileutils-ocaml-dev.dirs.in rules watch

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

Author: gildor
Date: Sun Jan  7 23:03:33 2007
New Revision: 3504

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3504
Log:
* Upgrade debian/watch version to 3,
* Upgrade debhelper debian/compat to 5,
* Use CDBS for debian/rules,
-- SLG

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

Modified: trunk/packages/ocaml-fileutils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/changelog?rev=3504&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/changelog Sun Jan  7 23:03:33 2007
@@ -1,3 +1,11 @@
+ocaml-fileutils (0.3.0-11) UNRELEASED; urgency=low
+
+  * Upgrade debian/watch version to 3,
+  * Upgrade debhelper debian/compat to 5,
+  * Use CDBS for debian/rules,
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon,  6 Nov 2006 23:41:00 +0100
+
 ocaml-fileutils (0.3.0-10) unstable; urgency=low
 
   * Change my email address to gildor at debian.org,

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

Modified: trunk/packages/ocaml-fileutils/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/control?rev=3504&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/control (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/control Sun Jan  7 23:03:33 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.0.0), ocaml-findlib, dpatch
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml-findlib
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils
 
 Package: libfileutils-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}
+Depends:
 Description: File manipulation for OCaml
  This library provides some functions which operate on the file system
  for the Objective Caml (OCaml) programming language.

Modified: trunk/packages/ocaml-fileutils/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/control.in?rev=3504&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/control.in (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/control.in Sun Jan  7 23:03:33 2007
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: ocaml-nox (>= #OCamlABI#), debhelper (>> 4.0.0), ocaml-findlib, dpatch
+Build-Depends: @cdbs@, ocaml-findlib
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils
 
 Package: libfileutils-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}
+Depends:
 Description: File manipulation for OCaml
  This library provides some functions which operate on the file system
  for the Objective Caml (OCaml) programming language.

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

Modified: trunk/packages/ocaml-fileutils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/rules?rev=3504&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/rules (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/rules Sun Jan  7 23:03:33 2007
@@ -1,73 +1,51 @@
 #!/usr/bin/make -f
+# debian/rules for ocaml-fileutils 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=`ocamlc -where`
-DESTDIR_DEV=$(CURDIR)/debian/libfileutils-ocaml-dev/
-OCAMLABI=$(shell ocamlc -version)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-debian/control: debian/control.in
-	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
-	
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	./configure --prefix=$(DESTDIR_DEV)/usr \
-	 --with-docdir=$(DESTDIR_DEV)/usr/share/ocaml-doc \
-	 --libdir=$(DESTDIR_DEV)/$(OCAMLIBDIR)
-	touch configure-stamp
+PACKAGE_DEV := libfileutils-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
-build-arch: configure-stamp build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-	$(MAKE) all
-	touch build-arch-stamp
+DEB_MAKE_CLEAN_TARGET    := distclean
+DEB_MAKE_BUILD_TARGET    := all 
+DEB_MAKE_INSTALL_TARGET  := install 
 
-build-indep: config.status  build-indep-stamp
-build-indep-stamp: 
-	dh_testdir
-	touch build-indep-stamp
+DEB_CONFIGURE_EXTRA_FLAGS = --prefix="$(DESTDIR_DEV)/usr" \
+			    --with-docdir="$(DESTDIR_DEV)/usr/share/ocaml-doc" \
+			    --libdir="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-build: build-arch build-indep
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	-$(RM) build-arch-stamp build-indep-stamp configure-stamp
-	-$(MAKE) distclean
-	dh_clean
+clean::
+	-$(RM) $(CURDIR)/debian/libfileutils-ocaml-dev.dirs 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
-	$(MAKE) install 
+install/libfileutils-ocaml-dev::
 	ocamldoc -html -d $(DESTDIR_DEV)/usr/share/doc/libfileutils-ocaml-dev/html \
 	  -load $(DESTDIR_DEV)/usr/share/ocaml-doc/fileutils.odoc
 	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/filePath.ml \
-	  > $(DESTDIR_DEV)/$(OCAMLIBDIR)/fileutils/filePath.mli
+	  > $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/fileutils/filePath.mli
 	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/fileUtil.ml \
-	  > $(DESTDIR_DEV)/$(OCAMLIBDIR)/fileutils/fileUtil.mli
+	  > $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/fileutils/fileUtil.mli
 
-binary-indep: 
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs -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 debian/control

Modified: trunk/packages/ocaml-fileutils/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/watch?rev=3504&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/watch (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/watch Sun Jan  7 23:03:33 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://www.carva.org/sylvain.le-gall/download/ocaml-fileutils-([0-9\.]*).tar.gz

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