[Pkg-ocaml-maint-commits] r3276 - in /trunk/packages/xml-light/trunk/debian: META.in META.xml-light.in changelog compat control control.in libxml-light-ocaml-dev.dirs.in libxml-light-ocaml-dev.install.in patches/00list patches/03_cflags.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Wed Oct 25 23:11:33 UTC 2006 

Author: gildor
Date: Wed Oct 25 23:11:32 2006
New Revision: 3276

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3276
Log:
* Migrate to CDBS,
-- SLG

Added:
    trunk/packages/xml-light/trunk/debian/META.xml-light.in
      - copied unchanged from r3272, trunk/packages/xml-light/trunk/debian/META.in
    trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.dirs.in
    trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in
    trunk/packages/xml-light/trunk/debian/patches/03_cflags.dpatch   (with props)
Removed:
    trunk/packages/xml-light/trunk/debian/META.in
Modified:
    trunk/packages/xml-light/trunk/debian/changelog
    trunk/packages/xml-light/trunk/debian/compat
    trunk/packages/xml-light/trunk/debian/control
    trunk/packages/xml-light/trunk/debian/control.in
    trunk/packages/xml-light/trunk/debian/patches/00list
    trunk/packages/xml-light/trunk/debian/rules

Modified: trunk/packages/xml-light/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/changelog?rev=3276&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/changelog (original)
+++ trunk/packages/xml-light/trunk/debian/changelog Wed Oct 25 23:11:32 2006
@@ -1,3 +1,12 @@
+xml-light (2.2-5) unstable; urgency=low
+
+  * Use CDBS for debian/rules,
+  * Upgrade debhelper debian/compat to 5,
+  * Use patch 03_cflags, to remove CFLAGS use in the
+    Makefile (CFLAGS has a particular meaning).
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 26 Oct 2006 00:43:02 +0200
+
 xml-light (2.2-4) unstable; urgency=low
 
   * Change my email address to gildor at debian.org,

Modified: trunk/packages/xml-light/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/compat?rev=3276&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/compat (original)
+++ trunk/packages/xml-light/trunk/debian/compat Wed Oct 25 23:11:32 2006
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/xml-light/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/control?rev=3276&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/control (original)
+++ trunk/packages/xml-light/trunk/debian/control Wed Oct 25 23:11:32 2006
@@ -2,9 +2,9 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), dpatch
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2)
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xml-light
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xml-light
 
 Package: libxml-light-ocaml-dev
 Architecture: any

Modified: trunk/packages/xml-light/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/control.in?rev=3276&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/control.in (original)
+++ trunk/packages/xml-light/trunk/debian/control.in Wed Oct 25 23:11:32 2006
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= #OCamlABI#), dpatch
+Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2)
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xml-light
 

Added: trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.dirs.in?rev=3276&op=file
==============================================================================
--- trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.dirs.in (added)
+++ trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.dirs.in Wed Oct 25 23:11:32 2006
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/xml-light

Added: trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in?rev=3276&op=file
==============================================================================
--- trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in (added)
+++ trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in Wed Oct 25 23:11:32 2006
@@ -1,0 +1,2 @@
+doc/*                 /usr/share/doc/libxml-light-ocaml-dev/html/
+debian/META.xml-light @OCamlStdlibDir@/METAS/

Modified: trunk/packages/xml-light/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/patches/00list?rev=3276&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/patches/00list (original)
+++ trunk/packages/xml-light/trunk/debian/patches/00list Wed Oct 25 23:11:32 2006
@@ -1,3 +1,3 @@
 01_installopt
 02_cmi_depends
-
+03_cflags

Added: trunk/packages/xml-light/trunk/debian/patches/03_cflags.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/patches/03_cflags.dpatch?rev=3276&op=file
==============================================================================
--- trunk/packages/xml-light/trunk/debian/patches/03_cflags.dpatch (added)
+++ trunk/packages/xml-light/trunk/debian/patches/03_cflags.dpatch Wed Oct 25 23:11:32 2006
@@ -1,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_cflags.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile	2006-10-26 00:22:41.000000000 +0200
++++ xml-light-2.2/Makefile	2006-10-26 00:24:45.000000000 +0200
+@@ -3,8 +3,8 @@
+ .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
+ 
+ INSTALLDIR=`ocamlc -where`
+-CFLAGS=
+-LFLAGS= -a
++XML_LIGHT_OCAML_CFLAGS= $(OCAML_CFLAGS)
++XML_LIGHT_OCAML_LFLAGS= $(OCAML_LFLAGS) -a
+ LIBS=
+ 
+ all: xml-light.cma test.exe doc
+@@ -28,10 +28,10 @@
+ 	ocamlopt xml-light.cmxa test.ml -o test_opt.exe
+ 
+ xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo 
+-	ocamlc -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
++	ocamlc -o xml-light.cma $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
+ 
+ xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx 
+-	ocamlopt -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
++	ocamlopt -o xml-light.cmxa $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
+ 
+ dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
+ 
+@@ -71,13 +71,13 @@
+ 
+ # SUFFIXES
+ .ml.cmo:
+-	ocamlc $(CFLAGS) -c $<
++	ocamlc $(XML_LIGHT_OCAML_CFLAGS) -c $<
+ 
+ .ml.cmx:
+-	ocamlopt $(CFLAGS) -c $<
++	ocamlopt $(XML_LIGHT_OCAML_CFLAGS) -c $<
+ 
+ .mli.cmi:
+-	ocamlc $(CFLAGS) $<
++	ocamlc $(XML_LIGHT_OCAML_CFLAGS) $<
+ 
+ .mll.ml:
+ 	ocamllex $<

Propchange: trunk/packages/xml-light/trunk/debian/patches/03_cflags.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/xml-light/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/rules?rev=3276&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/rules (original)
+++ trunk/packages/xml-light/trunk/debian/rules Wed Oct 25 23:11:32 2006
@@ -1,72 +1,80 @@
 #!/usr/bin/make -f
+# debian/rules for xml-light 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
-PACKAGE = xml-light
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-OCAML_LIBDIR=`ocamlc -where`
-VERSION=$(shell dpkg-parsechangelog | \
-	awk "/Version: .*/ { gsub(\"Version: \",\"\"); gsub(\"-.*\",\"\"); print; }")
-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/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)
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
-	$(MAKE) all
-	if [ -x /usr/bin/ocamlopt ] || [ -w /usr/bin/ocamlopt.opt ]; then \
-	  $(MAKE) opt; \
+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
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	$(RM) build-stamp
-	$(RM) -r doc
-	$(RM) xml-light.a
-	-$(MAKE) clean
-	dh_clean
+common-configure-indep common-configure-arch:: ocamlinit
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	
-	# Library
-	mkdir -p $(CURDIR)/debian/libxml-light-ocaml-dev/$(OCAML_LIBDIR)/xml-light
-	$(MAKE) install INSTALLDIR=$(CURDIR)/debian/libxml-light-ocaml-dev/$(OCAML_LIBDIR)/xml-light
-	if [ -x /usr/bin/ocamlopt ]; then \
-	  $(MAKE) installopt INSTALLDIR=$(CURDIR)/debian/libxml-light-ocaml-dev/$(OCAML_LIBDIR)/xml-light; \
-	fi
-	
-	# Documentation
-	$(MAKE) doc
-	mkdir -p $(CURDIR)/debian/libxml-light-ocaml-dev/usr/share/doc/libxml-light-ocaml-dev/html/
-	cp doc/* $(CURDIR)/debian/libxml-light-ocaml-dev/usr/share/doc/libxml-light-ocaml-dev/html/
+PACKAGE_DEV := libxml-light-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
-	# META
-	mkdir -p $(CURDIR)/debian/libxml-light-ocaml-dev/$(OCAML_LIBDIR)/METAS
-	sed -e "s/@VERSION@/$(VERSION)/" debian/META.in \
-	  > $(CURDIR)/debian/libxml-light-ocaml-dev/$(OCAML_LIBDIR)/METAS/META.xml-light
+DEB_MAKE_CLEAN_TARGET    := clean
 
-binary-indep: build install
+DEB_MAKE_BUILD_TARGET    := all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    += opt
+endif
+DEB_MAKE_BUILD_TARGET    += doc
 
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installexamples -a 
-	dh_installchangelogs -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_INSTALL_TARGET  := install 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_INSTALL_TARGET  += installopt
+endif
+DEB_MAKE_INSTALL_TARGET  += INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light"
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+clean::
+	-$(RM) -r doc
+	-$(RM) xml-light.a
+	-$(RM) debian/META.xml-light
+              
+install/libxml-light-ocaml-dev::
+	VERSION=$(DEB_NOEPOCH_VERSION); \
+	VERSION=$${VERSION%%-*}; \
+	sed -e "s/@VERSION@/$$VERSION/" debian/META.xml-light.in > debian/META.xml-light

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