[Pkg-ocaml-maint-commits] r2991 - in
/trunk/packages/ocaml-sha1/trunk/debian: META Makefile changelog
control control.in rules
ecc-guest at users.alioth.debian.org
ecc-guest at users.alioth.debian.org
Tue Jul 25 19:45:13 UTC 2006
Author: ecc-guest
Date: Tue Jul 25 19:45:11 2006
New Revision: 2991
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2991
Log:
added libsha1-ocaml package for runtime stub libs
converted to CDBS
Modified:
trunk/packages/ocaml-sha1/trunk/debian/META
trunk/packages/ocaml-sha1/trunk/debian/Makefile
trunk/packages/ocaml-sha1/trunk/debian/changelog
trunk/packages/ocaml-sha1/trunk/debian/control
trunk/packages/ocaml-sha1/trunk/debian/control.in
trunk/packages/ocaml-sha1/trunk/debian/rules
Modified: trunk/packages/ocaml-sha1/trunk/debian/META
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/META?rev=2991&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/META (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/META Tue Jul 25 19:45:11 2006
@@ -1,3 +1,3 @@
-version="0.4"
+version="0.8"
archive(byte)="sha1.cma"
archive(native)="sha1.cmxa"
Modified: trunk/packages/ocaml-sha1/trunk/debian/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/Makefile?rev=2991&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/Makefile (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/Makefile Tue Jul 25 19:45:11 2006
@@ -1,13 +1,14 @@
OCAMLMAKEFILE = /usr/share/ocaml-tools/OCamlMakefile
DESTDIR = $(shell ocamlc -where | sed s:/usr/lib/:/usr/local/lib/:)
OCAMLFIND_INSTFLAGS = -destdir $(DESTDIR) -ldconf ignore
+NO_CUSTOM = yes
CFLAGS = -O3
SOURCES = sha1.mli sha1.ml sha1_stubs.c
RESULT = sha1
-LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so)
-
all: byte-code-library
+install: libinstall
+
include $(OCAMLMAKEFILE)
Modified: trunk/packages/ocaml-sha1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/changelog?rev=2991&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/changelog Tue Jul 25 19:45:11 2006
@@ -1,3 +1,10 @@
+ocaml-sha1 (0.8-2) unstable; urgency=low
+
+ * Add libsha1-ocaml package with runtime stub libraries
+ * Convert debian/rules to CDBS
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 25 Jul 2006 14:21:30 -0400
+
ocaml-sha1 (0.8-1) unstable; urgency=low
* Initial packaging
Modified: trunk/packages/ocaml-sha1/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/control?rev=2991&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/control (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/control Tue Jul 25 19:45:11 2006
@@ -2,13 +2,26 @@
Section: devel
Priority: optional
Maintainer: Eric Cooper <ecc at cmu.edu>
-Build-Depends: debhelper (>= 5.0), ocaml-nox (>= 3.09.2), ocaml-tools, ocaml-findlib
+Build-Depends: debhelper (>= 5.0), cdbs, ocaml-nox (>= 3.09.2), ocaml-tools, ocaml-findlib
Standards-Version: 3.7.2
+
+Package: libsha1-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: SHA1 library for OCaml
+ SHA1 is a 160-bit cryptographic hash function.
+ This library provides SHA1 functions for use by OCaml programs.
+ .
+ This package contains the shared runtime stub libraries.
Package: libsha1-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}
-Description: SHA1 binding for OCaml
+Depends: ocaml-nox-${F:OCamlABI}, libsha1-ocaml (= ${Source-Version})
+Description: SHA1 library for OCaml
SHA1 is a 160-bit cryptographic hash function.
- This library provides an interface for OCaml programs to use SHA1 functions.
+ This library provides SHA1 functions for use by OCaml programs.
+ .
+ This package contains the files needed to compile OCaml programs
+ that use the SHA1 library.
Modified: trunk/packages/ocaml-sha1/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/control.in?rev=2991&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/control.in (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/control.in Tue Jul 25 19:45:11 2006
@@ -2,13 +2,26 @@
Section: devel
Priority: optional
Maintainer: Eric Cooper <ecc at cmu.edu>
-Build-Depends: debhelper (>= 5.0), ocaml-nox (>= @OCamlABI@), ocaml-tools, ocaml-findlib
+Build-Depends: debhelper (>= 5.0), cdbs, ocaml-nox (>= @OCamlABI@), ocaml-tools, ocaml-findlib
Standards-Version: 3.7.2
+
+Package: libsha1-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: SHA1 library for OCaml
+ SHA1 is a 160-bit cryptographic hash function.
+ This library provides SHA1 functions for use by OCaml programs.
+ .
+ This package contains the shared runtime stub libraries.
Package: libsha1-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}
-Description: SHA1 binding for OCaml
+Depends: ocaml-nox-${F:OCamlABI}, libsha1-ocaml (= ${Source-Version})
+Description: SHA1 library for OCaml
SHA1 is a 160-bit cryptographic hash function.
- This library provides an interface for OCaml programs to use SHA1 functions.
+ This library provides SHA1 functions for use by OCaml programs.
+ .
+ This package contains the files needed to compile OCaml programs
+ that use the SHA1 library.
Modified: trunk/packages/ocaml-sha1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/rules?rev=2991&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/rules (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/rules Tue Jul 25 19:45:11 2006
@@ -1,72 +1,36 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+PKG = sha1
OCAMLABI = $(shell ocamlc -version)
-make = $(MAKE) -f debian/Makefile
+update-abi:
+ sed -e 's/@OCamlABI@/$(OCAMLABI)/g' debian/control.in > debian/control
-debian/control:
- sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $@.in > $@
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -f debian/Makefile
-build: build-stamp
-build-stamp:
- dh_testdir
- cp -p debian/META .
- $(make) byte-code-library
- [ ! -x /usr/bin/ocamlopt ] || $(make) native-code-library
- touch build-stamp
+NATIVECODE = $(shell [ -x /usr/bin/ocamlopt ] && echo native-code-library)
+DEB_MAKE_BUILD_TARGET = byte-code-library $(NATIVECODE)
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -$(make) clean
- dh_clean
+OCAMLLIBDIR = $(shell ocamlc -where)
+DESTDIR=$(CURDIR)/debian/lib$(PKG)-ocaml-dev/$(OCAMLLIBDIR)
+STUBDIR=$(CURDIR)/debian/lib$(PKG)-ocaml/$(OCAMLLIBDIR)/stublibs
-DESTDIR = $(CURDIR)/debian/$(shell dh_listpackages)$(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+
+common-install-prehook-impl::
mkdir -p $(DESTDIR)
- $(make) DESTDIR=$(DESTDIR) libinstall
+ cp debian/META META
-binary-indep: build install
+clean::
+ rm -f META
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs README
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installcatalogs
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_undocumented
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums
- dh_builddeb
+# move runtime stub libs to the non-dev package
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-# -*- makefile-mode -*-
+common-install-impl::
+ mkdir -p $(STUBDIR)
+ mv $(DESTDIR)/$(PKG)/*.so $(STUBDIR)
More information about the Pkg-ocaml-maint-commits
mailing list