[Pkg-ocaml-maint-commits] r3509 - in
/trunk/packages/xml-light/trunk/debian: changelog control
control.in rules watch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Jan 7 23:08:03 CET 2007
Author: gildor
Date: Sun Jan 7 23:08:03 2007
New Revision: 3509
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3509
Log:
* Upgrade debian/watch version to 3,
* Use "sed -i" to process debian/META.xml-light
* Use ocaml.ml
-- SLG
Modified:
trunk/packages/xml-light/trunk/debian/changelog
trunk/packages/xml-light/trunk/debian/control
trunk/packages/xml-light/trunk/debian/control.in
trunk/packages/xml-light/trunk/debian/rules
trunk/packages/xml-light/trunk/debian/watch
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=3509&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/changelog (original)
+++ trunk/packages/xml-light/trunk/debian/changelog Sun Jan 7 23:08:03 2007
@@ -1,3 +1,10 @@
+xml-light (2.2-7) UNRELEASED; urgency=low
+
+ * Upgrade debian/watch version to 3,
+ * Use "sed -i" to process debian/META.xml-light,
+
+ -- Sylvain Le Gall <gildor at debian.org> Sun, 5 Nov 2006 16:23:33 +0100
+
xml-light (2.2-6) unstable; urgency=low
* Remove trace call (Closes: #382828, #383255)
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=3509&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/control (original)
+++ trunk/packages/xml-light/trunk/debian/control Sun Jan 7 23:08:03 2007
@@ -2,7 +2,7 @@
Section: libdevel
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)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7)
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xml-light
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=3509&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/control.in (original)
+++ trunk/packages/xml-light/trunk/debian/control.in Sun Jan 7 23:08:03 2007
@@ -2,7 +2,7 @@
Section: libdevel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2)
+Build-Depends: @cdbs@
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xml-light
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=3509&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/rules (original)
+++ trunk/packages/xml-light/trunk/debian/rules Sun Jan 7 23:08:03 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 := libxml-light-ocaml-dev
DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -69,12 +42,16 @@
endif
DEB_MAKE_INSTALL_TARGET += INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light"
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+
clean::
- -$(RM) -r doc
- -$(RM) xml-light.a
- -$(RM) debian/META.xml-light
+ -$(RM) -r $(CURDIR)/doc
+ -$(RM) $(CURDIR)/xml-light.a
+ -$(RM) $(CURDIR)/debian/META.xml-light
+ -$(RM) $(CURDIR)/debian/libxml-light-ocaml-dev.dirs
+ -$(RM) $(CURDIR)/debian/libxml-light-ocaml-dev.install
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
+ sed -i "s/@VERSION@/$$VERSION/g" $(CURDIR)/debian/META.xml-light
Modified: trunk/packages/xml-light/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/watch?rev=3509&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/watch (original)
+++ trunk/packages/xml-light/trunk/debian/watch Sun Jan 7 23:08:03 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
http://tech.motion-twin.com/xmllight.html zip/xml-light-([0-9.]*)\.zip
More information about the Pkg-ocaml-maint-commits
mailing list