[Pkg-ocaml-maint-commits] r3508 - in
/trunk/packages/ounit/trunk/debian: changelog control control.in
rules watch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Jan 7 23:07:25 CET 2007
Author: gildor
Date: Sun Jan 7 23:07:24 2007
New Revision: 3508
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3508
Log:
* Upgrade debian/watch version to 3,
* Remove generated files from debian/*.in,
* Use ocaml.ml,
* Remove commented part of former rules
-- SLG
Modified:
trunk/packages/ounit/trunk/debian/changelog
trunk/packages/ounit/trunk/debian/control
trunk/packages/ounit/trunk/debian/control.in
trunk/packages/ounit/trunk/debian/rules
trunk/packages/ounit/trunk/debian/watch
Modified: trunk/packages/ounit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/changelog?rev=3508&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/changelog (original)
+++ trunk/packages/ounit/trunk/debian/changelog Sun Jan 7 23:07:24 2007
@@ -1,3 +1,10 @@
+ounit (1.0.2-6) UNRELEASED; urgency=low
+
+ * Upgrade debian/watch version to 3,
+ * Remove generated files from debian/*.in,
+
+ -- Sylvain Le Gall <gildor at debian.org> Sun, 5 Nov 2006 16:23:31 +0100
+
ounit (1.0.2-5) unstable; urgency=low
* Use CDBS for debian/rules,
Modified: trunk/packages/ounit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control?rev=3508&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control (original)
+++ trunk/packages/ounit/trunk/debian/control Sun Jan 7 23:07:24 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.0.4-1), docbook-utils
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml-findlib (>= 1.0.4-1), docbook-utils
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ounit
Modified: trunk/packages/ounit/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control.in?rev=3508&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control.in (original)
+++ trunk/packages/ounit/trunk/debian/control.in Sun Jan 7 23:07:24 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.0.4-1), docbook-utils
+Build-Depends: @cdbs@, ocaml-findlib (>= 1.0.4-1), docbook-utils
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ounit
Modified: trunk/packages/ounit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/rules?rev=3508&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/rules (original)
+++ trunk/packages/ounit/trunk/debian/rules Sun Jan 7 23:07:24 2007
@@ -23,34 +23,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
-
-# Taken from ocaml.mk
-OCAMLABI = $(shell ocamlc -version)
-DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
-OCAML_HAVE_OCAMLOPT := $(shell if test -x /usr/bin/ocamlopt ; then echo "yes" ; else echo "no" ; fi)
-OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
-
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-
-ocamlinit:
- echo -n > $(CURDIR)/ocamlinit-stamp; \
- for f in $(OFILES); do \
- sed -e 's/@OCamlStdlibDir@/$(subst /,\/,$(OCAML_STDLIB_DIR))/g' \
- $$f.in > $$f; \
- echo $$f >> $(CURDIR)/ocamlinit-stamp; \
- done
-
-clean::
- if [ -e $(CURDIR)/ocamlinit-stamp ]; then \
- for f in `cat $(CURDIR)/ocamlinit-stamp`; do \
- if [ -e $$f.in ] && [ -e $$f ]; then \
- $(RM) $$f; \
- fi; \
- done; \
- $(RM) $(CURDIR)/ocamlinit-stamp; \
- fi
-
-common-configure-indep common-configure-arch:: ocamlinit
+include /usr/share/cdbs/1/class/ocaml.mk
PACKAGE_DEV := libounit-ocaml-dev
DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -66,79 +39,15 @@
DEB_MAKE_INSTALL_TARGET := install
DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+
clean::
- -$(RM) depend
- -$(RM) -r manual
+ -$(RM) $(CURDIR)/depend
+ -$(RM) -r $(CURDIR)/manual
+ -$(RM) $(CURDIR)/debian/libounit-ocaml-dev.dirs
manual:
mkdir manual
docbook2html doc/manual/src/OUnit.xml --output manual
build/libounit-ocaml-dev::manual
-
-#include /usr/share/dpatch/dpatch.make
-#
-#PACKAGE=ounit
-#OCAMLABI=$(shell ocamlc -version)
-#DD := debian/libounit-ocaml-dev
-#OCAMLDIR := $(shell ocamlc -where)
-#DDOCAMLDIR := $(DD)/$(OCAMLDIR)
-#
-#debian/control: debian/control.in
-# sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
-#
-#configure: configure-stamp
-#configure-stamp: patch-stamp
-# dh_testdir
-# touch configure-stamp
-#
-#build: build-stamp
-#build-stamp: configure-stamp
-# dh_testdir
-# $(MAKE) depend
-# $(MAKE) all
-# if [ -x /usr/bin/ocamlopt ]; then $(MAKE) allopt; fi
-# $(MAKE) doc
-# touch build-stamp
-#
-#clean: unpatch
-# dh_testdir
-# dh_testroot
-# rm -f build-stamp configure-stamp
-# -$(MAKE) clean
-# -rm depend
-# dh_clean
-#
-#install: build
-# dh_testdir
-# dh_testroot
-# dh_clean -k
-# dh_installdirs
-# mkdir -p $(DDOCAMLDIR)
-# $(MAKE) install DESTDIR=$(DDOCAMLDIR)
-#
-#binary-indep: build install
-#
-#binary-arch: build install
-# dh_testdir -a
-# dh_testroot -a
-# dh_installchangelogs -a changelog
-# dh_installdocs -a
-# mv $(DD)/usr/share/doc/libounit-ocaml-dev/*.{css,html} \
-# $(DD)/usr/share/doc/libounit-ocaml-dev/html/api
-# docbook2html $(DD)/usr/share/doc/libounit-ocaml-dev/OUnit.xml \
-# --output $(DD)/usr/share/doc/libounit-ocaml-dev/html/manual
-# dh_installexamples -a examples/*
-# dh_installman -a
-# dh_link -a
-# dh_strip -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-indep binary-arch
-#.PHONY: build clean binary-indep binary-arch binary install configure debian/control
Modified: trunk/packages/ounit/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/watch?rev=3508&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/watch (original)
+++ trunk/packages/ounit/trunk/debian/watch Sun Jan 7 23:07:24 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
http://www.xs4all.nl/~mmzeeman/ocaml/index.html ounit-([0-9\.]*)\.tar\.gz
More information about the Pkg-ocaml-maint-commits
mailing list