[Pkg-ocaml-maint-commits] r2141 - trunk/packages/pxp/trunk/debian

Sat Nov 26 18:39:28 UTC 2005

Author: zack
Date: 2005-11-26 18:39:27 +0000 (Sat, 26 Nov 2005)
New Revision: 2141

Added:
   trunk/packages/pxp/trunk/debian/control.in
   trunk/packages/pxp/trunk/debian/dirs.in
Modified:
   trunk/packages/pxp/trunk/debian/changelog
   trunk/packages/pxp/trunk/debian/control
   trunk/packages/pxp/trunk/debian/dirs
   trunk/packages/pxp/trunk/debian/rules
Log:
ocaml 3.09 transition


Modified: trunk/packages/pxp/trunk/debian/changelog
===================================================================

--- trunk/packages/pxp/trunk/debian/changelog	2005-11-26 18:26:50 UTC (rev 2140)
+++ trunk/packages/pxp/trunk/debian/changelog	2005-11-26 18:39:27 UTC (rev 2141)
@@ -1,3 +1,14 @@
+pxp (1.1.96-1) unstable; urgency=low
+
+  * new upstream release
+  * rebuilt with ocaml 3.09
+  * debian/*
+    - no more hardcoding of ocaml abi version anywhere
+  * debian/rules
+    - use cdbs
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 26 Nov 2005 19:08:25 +0100
+
 pxp (1.1.95-7) unstable; urgency=low
 
   * debian/control

Modified: trunk/packages/pxp/trunk/debian/control
===================================================================
--- trunk/packages/pxp/trunk/debian/control	2005-11-26 18:26:50 UTC (rev 2140)
+++ trunk/packages/pxp/trunk/debian/control	2005-11-26 18:39:27 UTC (rev 2141)
@@ -2,12 +2,12 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, ocaml-findlib, libocamlnet-ocaml-dev (>= 1.1-3), ocaml-ulex (>= 0.7-1), dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-6), ocaml-ulex (>= 0.8-1), dpatch, cdbs
 Standards-Version: 3.6.2
 
 Package: libpxp-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-3.08.3, libocamlnet-ocaml-dev (>= 1.1-3), ocaml-findlib, ocaml-ulex (>= 0.7-1)
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 1.1-6), ocaml-findlib (>= 1.1), ocaml-ulex (>= 0.8-1)
 Description: OCaml library that implement an XML-1.0 validating parser
  PXP is a validating parser for XML-1.0 which has been written entirely
  in Objective Caml.

Copied: trunk/packages/pxp/trunk/debian/control.in (from rev 1919, trunk/packages/pxp/trunk/debian/control)
===================================================================
--- trunk/packages/pxp/trunk/debian/control	2005-11-04 16:21:23 UTC (rev 1919)
+++ trunk/packages/pxp/trunk/debian/control.in	2005-11-26 18:39:27 UTC (rev 2141)
@@ -0,0 +1,18 @@
+Source: pxp
+Section: libdevel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-7), ocaml-ulex (>= 0.8-1), dpatch, cdbs
+Standards-Version: 3.6.2
+
+Package: libpxp-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 1.1-7), ocaml-findlib (>= 1.1), ocaml-ulex (>= 0.8-1)
+Description: OCaml library that implement an XML-1.0 validating parser
+ PXP is a validating parser for XML-1.0 which has been written entirely
+ in Objective Caml.
+ .
+ PXP is the new name of the parser formerly known as "Markup". PXP means
+ "Polymorphic XML parser" and emphasizes its most useful property: that
+ the API is polymorphic and can be configured such that different objects
+ are used to store different types of elements.

Modified: trunk/packages/pxp/trunk/debian/dirs
===================================================================
--- trunk/packages/pxp/trunk/debian/dirs	2005-11-26 18:26:50 UTC (rev 2140)
+++ trunk/packages/pxp/trunk/debian/dirs	2005-11-26 18:39:27 UTC (rev 2141)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.09.0

Copied: trunk/packages/pxp/trunk/debian/dirs.in (from rev 1919, trunk/packages/pxp/trunk/debian/dirs)
===================================================================
--- trunk/packages/pxp/trunk/debian/dirs	2005-11-04 16:21:23 UTC (rev 1919)
+++ trunk/packages/pxp/trunk/debian/dirs.in	2005-11-26 18:39:27 UTC (rev 2141)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@

Modified: trunk/packages/pxp/trunk/debian/rules
===================================================================
--- trunk/packages/pxp/trunk/debian/rules	2005-11-26 18:26:50 UTC (rev 2140)
+++ trunk/packages/pxp/trunk/debian/rules	2005-11-26 18:39:27 UTC (rev 2141)
@@ -1,80 +1,24 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-include /usr/share/dpatch/dpatch.make
-
-#export DH_VERBOSE=1
-
 PKGNAME = libpxp-ocaml-dev
-TARGETDIR = $(CURDIR)/debian/$(PKGNAME)
-OCAML_LIB_DIR = $(shell ocamlc -where)
+OCAMLABI := $(shell ocamlc -version)
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-
-	./configure			\
-    		-without-wlex		\
-    		-without-wlex-compat
-
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	$(MAKE) all
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; else true; fi
-
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	$(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-# remove dangling symlink in examples subdir
-	-for f in $(TARGETDIR)/usr/share/doc/$(PKGNAME)/examples/xmlforms/styles/*;\
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+configure/$(PKGNAME)::
+	./configure -without-wlex -without-wlex-compat
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+	$(MAKE) opt
+endif
+binary-post-install/$(PKGNAME)::
+	-for f in debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/examples/xmlforms/styles/*;\
 	do test ! -r $$f && rm -f $$f; done
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-
- # remove some zero sized files
-	-find $(TARGETDIR)/ -size 0 -exec rm {} \;
- # remove .cvsignore files
-	-find $(TARGETDIR)/ -name .cvsignore -exec rm {} \;
-
-	dh_installdeb
-#	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-
-.PHONY: build clean binary-arch binary install configure


