[Pkg-ocaml-maint-commits] r3283 - in
/trunk/packages/ounit/trunk/debian: changelog compat control
control.in dirs docs libounit-ocaml-dev.dirs.in libounit-ocaml-dev.docs
libounit-ocaml-dev.examples libounit-ocaml-dev.install rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Thu Oct 26 22:20:45 UTC 2006
Author: gildor
Date: Thu Oct 26 22:20:44 2006
New Revision: 3283
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3283
Log:
* Move to CDBS,
* Upgrade to compat=5,
* Close bug #370758,
-- SLG
Added:
trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.dirs.in
trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.docs
- copied, changed from r3272, trunk/packages/ounit/trunk/debian/docs
trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.examples
trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.install
Removed:
trunk/packages/ounit/trunk/debian/dirs
trunk/packages/ounit/trunk/debian/docs
Modified:
trunk/packages/ounit/trunk/debian/changelog
trunk/packages/ounit/trunk/debian/compat
trunk/packages/ounit/trunk/debian/control
trunk/packages/ounit/trunk/debian/control.in
trunk/packages/ounit/trunk/debian/rules
Modified: trunk/packages/ounit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/changelog?rev=3283&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/changelog (original)
+++ trunk/packages/ounit/trunk/debian/changelog Thu Oct 26 22:20:44 2006
@@ -1,3 +1,15 @@
+ounit (1.0.2-5) unstable; urgency=low
+
+ * Use CDBS for debian/rules,
+ * Upgrade debhelper debian/compat to 5,
+ * Better use debhelper script, add files :
+ - libounit-ocaml-dev.docs,
+ - libounit-ocaml-dev.dirs.in,
+ - libounit-ocaml-dev.install (Closes: #370758),
+ - libounit-ocaml-dev.examples.
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 26 Oct 2006 23:31:47 +0200
+
ounit (1.0.2-4) unstable; urgency=low
* Change my email address to gildor at debian.org,
Modified: trunk/packages/ounit/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/compat?rev=3283&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/compat (original)
+++ trunk/packages/ounit/trunk/debian/compat Thu Oct 26 22:20:44 2006
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/ounit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control?rev=3283&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control (original)
+++ trunk/packages/ounit/trunk/debian/control Thu Oct 26 22:20:44 2006
@@ -2,9 +2,9 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.0.4-1), dpatch, docbook-utils
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.0.4-1), docbook-utils
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ounit
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ounit
Package: libounit-ocaml-dev
Architecture: any
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=3283&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control.in (original)
+++ trunk/packages/ounit/trunk/debian/control.in Thu Oct 26 22:20:44 2006
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= #OCamlABI#), ocaml-findlib (>= 1.0.4-1), dpatch, docbook-utils
+Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), 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
Added: trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.dirs.in?rev=3283&op=file
==============================================================================
--- trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.dirs.in (added)
+++ trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.dirs.in Thu Oct 26 22:20:44 2006
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@
Copied: trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.docs (from r3272, trunk/packages/ounit/trunk/debian/docs)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.docs?rev=3283&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/docs (original)
+++ trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.docs Thu Oct 26 22:20:44 2006
@@ -1,4 +1,2 @@
README
-doc/*.html
-doc/*.css
doc/manual/src/OUnit.xml
Added: trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.examples
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.examples?rev=3283&op=file
==============================================================================
--- trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.examples (added)
+++ trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.examples Thu Oct 26 22:20:44 2006
@@ -1,0 +1,1 @@
+examples/*
Added: trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.install?rev=3283&op=file
==============================================================================
--- trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.install (added)
+++ trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.install Thu Oct 26 22:20:44 2006
@@ -1,0 +1,3 @@
+doc/*.html /usr/share/doc/libounit-ocaml-dev/html/api/
+doc/*.css /usr/share/doc/libounit-ocaml-dev/html/api/
+manual/* /usr/share/doc/libounit-ocaml-dev/html/manual/
Modified: trunk/packages/ounit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/rules?rev=3283&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/rules (original)
+++ trunk/packages/ounit/trunk/debian/rules Thu Oct 26 22:20:44 2006
@@ -1,68 +1,144 @@
#!/usr/bin/make -f
+# debian/rules for ounit 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
-PACKAGE=ounit
-OCAMLABI=$(shell ocamlc -version)
-DD := debian/libounit-ocaml-dev
-OCAMLDIR := $(shell ocamlc -where)
-DDOCAMLDIR := $(DD)/$(OCAMLDIR)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
-debian/control: debian/control.in
- sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+# 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)
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- touch configure-stamp
+OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-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
+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: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) clean
- -rm depend
- dh_clean
+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
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- mkdir -p $(DDOCAMLDIR)
- $(MAKE) install DESTDIR=$(DDOCAMLDIR)
+common-configure-indep common-configure-arch:: ocamlinit
-binary-indep: build install
+PACKAGE_DEV := libounit-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
-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
+DEB_MAKE_CLEAN_TARGET := clean
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+DEB_MAKE_BUILD_TARGET := depend all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET += allopt
+endif
+DEB_MAKE_BUILD_TARGET += doc
+
+DEB_MAKE_INSTALL_TARGET := install
+DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
+
+clean::
+ -$(RM) depend
+ -$(RM) -r manual
+
+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
More information about the Pkg-ocaml-maint-commits
mailing list