[Pkg-ocaml-maint-commits] r2161 -
trunk/packages/ocaml-expat/trunk/debian
Enrico Tassi
gares-guest at costa.debian.org
Sun Nov 27 13:53:30 UTC 2005
Author: gares-guest
Date: 2005-11-27 13:53:27 +0000 (Sun, 27 Nov 2005)
New Revision: 2161
Added:
trunk/packages/ocaml-expat/trunk/debian/control.in
trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs.in
trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install.in
trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install.in
Modified:
trunk/packages/ocaml-expat/trunk/debian/control
trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs
trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install
trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install
trunk/packages/ocaml-expat/trunk/debian/rules
Log:
moved to cdbs
Modified: trunk/packages/ocaml-expat/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/control 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/control 2005-11-27 13:53:27 UTC (rev 2161)
@@ -1,13 +1,13 @@
Source: ocaml-expat
Priority: optional
Maintainer: Enrico Tassi <gareuselesinge at users.sourceforge.net>
-Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, ocaml-nox-3.09.0, dpatch, ocaml-findlib
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, ocaml-nox (>= 3.09.0), dpatch, ocaml-findlib (>= 1.1), cdbs
+Standards-Version: 3.6.2
Package: libexpat-ocaml-dev
Section: libdevel
Architecture: any
-Depends: libexpat-ocaml (= ${Source-Version}), libexpat1-dev, ocaml-nox-3.09.0, ocaml-findlib
+Depends: libexpat-ocaml (= ${Source-Version}), libexpat1-dev, ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1)
Description: ocaml expat bindings
This Objective Caml library provides XML parsing facilities based on the expat
library.
@@ -17,7 +17,7 @@
Package: libexpat-ocaml
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.09.0
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
Description: ocaml expat bindings
This Objective Caml library provides XML parsing facilities based on the expat
library.
Added: trunk/packages/ocaml-expat/trunk/debian/control.in
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/control.in 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/control.in 2005-11-27 13:53:27 UTC (rev 2161)
@@ -0,0 +1,25 @@
+Source: ocaml-expat
+Priority: optional
+Maintainer: Enrico Tassi <gareuselesinge at users.sourceforge.net>
+Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, ocaml-nox (>= @OCamlABI@), dpatch, ocaml-findlib (>= 1.1), cdbs
+Standards-Version: 3.6.2
+
+Package: libexpat-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: libexpat-ocaml (= ${Source-Version}), libexpat1-dev, ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1)
+Description: ocaml expat bindings
+ This Objective Caml library provides XML parsing facilities based on the expat
+ library.
+ .
+ This package contains the developpment part of the ocaml expat package.
+
+Package: libexpat-ocaml
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Description: ocaml expat bindings
+ This Objective Caml library provides XML parsing facilities based on the expat
+ library.
+ .
+ This package contains only the shared runtime stub libraries.
Modified: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs 2005-11-27 13:53:27 UTC (rev 2161)
@@ -1 +1 @@
-usr/lib/ocaml/3.09.0/expat
+usr/lib/ocaml/3.09.0/expat/
Added: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs.in
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs.in 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs.in 2005-11-27 13:53:27 UTC (rev 2161)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/expat/
Modified: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install 2005-11-27 13:53:27 UTC (rev 2161)
@@ -1 +1,4 @@
-/usr/lib/ocaml/3.09.0/expat/*
+debian/tmp/usr/lib/ocaml/3.09.0/expat/META
+debian/tmp/usr/lib/ocaml/3.09.0/expat/lib*.a
+debian/tmp/usr/lib/ocaml/3.09.0/expat/*.cm*
+debian/tmp/usr/lib/ocaml/3.09.0/expat/*.ml*
Added: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install.in
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install.in 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install.in 2005-11-27 13:53:27 UTC (rev 2161)
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/expat/META
+debian/tmp/usr/lib/ocaml/@OCamlABI@/expat/lib*.a
+debian/tmp/usr/lib/ocaml/@OCamlABI@/expat/*.cm*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/expat/*.ml*
Modified: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install 2005-11-27 13:53:27 UTC (rev 2161)
@@ -1 +1,2 @@
-usr/lib/ocaml/3.09.0/stublibs/*.so
+debian/tmp/usr/lib/ocaml/3.09.0/expat/dll*.so usr/lib/ocaml/3.09.0/stublibs/
+
Added: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install.in
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install.in 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install.in 2005-11-27 13:53:27 UTC (rev 2161)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/expat/dll*.so usr/lib/ocaml/@OCamlABI@/stublibs/
+
Modified: trunk/packages/ocaml-expat/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/rules 2005-11-27 13:25:33 UTC (rev 2160)
+++ trunk/packages/ocaml-expat/trunk/debian/rules 2005-11-27 13:53:27 UTC (rev 2161)
@@ -1,105 +1,26 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+PKGNAME = libexpat-ocaml-dev
-TARGETDIR = $(CURDIR)/debian/tmp
-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")
+DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
-CFLAGS = -Wall -g
+ocamlinit:
+ for f in $(OFILES); do \
+ sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; \
+ done
+
+build/$(PKGNAME)::
+ mkdir -p $(DESTDIR)
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-build-stamp: patch-stamp configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- if [ -x /usr/bin/ocamlopt ]; then $(MAKE) allopt; fi
-
- touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- mkdir -p $(TARGETDIR)$(OCAML_LIB_DIR)
- mkdir -p $(TARGETDIR)$(OCAML_LIB_DIR)/stublibs
- $(MAKE) install DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
- dh_install --sourcedir=debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs changelog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# work around cdbs' bug
+unpatch: deapply-dpatches
More information about the Pkg-ocaml-maint-commits
mailing list