[Pkg-ocaml-maint-commits] r1995 - in trunk/packages/findlib/trunk/debian: . patches

Stefano Zacchiroli zack at costa.debian.org
Sat Nov 12 18:03:49 UTC 2005 

Author: zack
Date: 2005-11-12 18:03:48 +0000 (Sat, 12 Nov 2005)
New Revision: 1995

Added:
   trunk/packages/findlib/trunk/debian/ocaml-findlib.docs
Removed:
   trunk/packages/findlib/trunk/debian/docs
   trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs.in
   trunk/packages/findlib/trunk/debian/patches/29_no_itest.dpatch
Modified:
   trunk/packages/findlib/trunk/debian/changelog
   trunk/packages/findlib/trunk/debian/control
   trunk/packages/findlib/trunk/debian/control.in
   trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs
   trunk/packages/findlib/trunk/debian/patches/00list
   trunk/packages/findlib/trunk/debian/rules
Log:
cdbs


Modified: trunk/packages/findlib/trunk/debian/changelog
===================================================================
--- trunk/packages/findlib/trunk/debian/changelog	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/changelog	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,3 +1,15 @@
+findlib (1.1-3) unstable; urgency=low
+
+  * debian/*
+    - use cdbs
+  * removed ancient symlink <stdlib>/findlib/topfind -> ../topfind
+  * debian/rules
+    - removed old bugfix for missed install of num-top printers
+  * debian/rules vs debian/patches/29_no_itest.dpatch
+    - removed patch, avoid invoking ./itest in debian/rules is easier
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 12 Nov 2005 13:06:42 +0100
+
 findlib (1.1-2) unstable; urgency=low
 
   * debian/patches/29_no_itest.dpatch

Modified: trunk/packages/findlib/trunk/debian/control
===================================================================
--- trunk/packages/findlib/trunk/debian/control	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/control	2005-11-12 18:03:48 UTC (rev 1995)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.0), m4, gawk | awk, dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.0), m4, gawk | awk, dpatch, cdbs
 Standards-Version: 3.6.2
 
 Package: ocaml-findlib

Modified: trunk/packages/findlib/trunk/debian/control.in
===================================================================
--- trunk/packages/findlib/trunk/debian/control.in	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/control.in	2005-11-12 18:03:48 UTC (rev 1995)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml (>= @OCamlABI@), m4, gawk | awk, dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml (>= @OCamlABI@), m4, gawk | awk, dpatch, cdbs
 Standards-Version: 3.6.2
 
 Package: ocaml-findlib

Deleted: trunk/packages/findlib/trunk/debian/docs
===================================================================
--- trunk/packages/findlib/trunk/debian/docs	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/docs	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,4 +0,0 @@
-doc/guide-html
-doc/QUICKSTART
-doc/README
-doc/ref-html

Modified: trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs
===================================================================
--- trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,2 +1 @@
-usr/lib/ocaml/3.09.0/METAS
 usr/share/ocaml-findlib

Deleted: trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs.in
===================================================================
--- trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs.in	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/ocaml-findlib.dirs.in	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,2 +0,0 @@
-usr/lib/ocaml/@OCamlABI@/METAS
-usr/share/ocaml-findlib

Copied: trunk/packages/findlib/trunk/debian/ocaml-findlib.docs (from rev 1933, trunk/packages/findlib/trunk/debian/docs)

Modified: trunk/packages/findlib/trunk/debian/patches/00list
===================================================================
--- trunk/packages/findlib/trunk/debian/patches/00list	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/patches/00list	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,4 +1,3 @@
 17_stddirs.dpatch
 19_site_lib_metas.dpatch
 23_include.dpatch
-29_no_itest.dpatch

Deleted: trunk/packages/findlib/trunk/debian/patches/29_no_itest.dpatch
===================================================================
--- trunk/packages/findlib/trunk/debian/patches/29_no_itest.dpatch	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/patches/29_no_itest.dpatch	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 29_no_itest.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad trunk~/itest trunk/itest
---- trunk~/itest	2005-11-01 01:36:34.000000000 +0100
-+++ trunk/itest	2005-11-10 10:13:30.000000000 +0100
-@@ -1,4 +1,5 @@
- #! /bin/sh
-+exit 0
- # $Id: itest 49 2003-12-30 09:48:02Z gerd $
- # ----------------------------------------------------------------------
- #

Modified: trunk/packages/findlib/trunk/debian/rules
===================================================================
--- trunk/packages/findlib/trunk/debian/rules	2005-11-11 17:04:23 UTC (rev 1994)
+++ trunk/packages/findlib/trunk/debian/rules	2005-11-12 18:03:48 UTC (rev 1995)
@@ -1,100 +1,40 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+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
+PKGNAME = ocaml-findlib
 
-include /usr/share/dpatch/dpatch.make
-
-OCAML_LIB_DIR := $(shell ocamlc -where)
 OCAMLABI := $(shell ocamlc -version)
-FINDLIB_METAS = $(shell ls site-lib-src/)
+OCAMLLIBDIR := $(shell ocamlc -where)
 OFILES = $(patsubst %.in,%,$(shell ls debian/*.in))
-METAS_DIR = METAS
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-
+configure/$(PKGNAME)::
+	rm -f README # just a symlink, the good one is doc/README
 	./configure \
 		-config /etc/ocamlfind.conf \
 		-bindir /usr/bin \
-		-sitelib $(OCAML_LIB_DIR) \
+		-sitelib $(OCAMLLIBDIR) \
 		-mandir /usr/share/man \
 		-with-toolbox
-
-	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
-	./itest
-
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-
-	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
-	rm -f Makefile.config depend config/*.cm[io]
-	rm -f site-lib-src/{bigarray,camlp4,dbm,dynlink,graphics,labltk,num,num-top,stdlib,str,threads,unix}/META
-	rm -f src/findlib/{META,fl_metascanner.ml,depend}
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp
-	ln -fs "../topfind" $(CURDIR)/debian/tmp$(OCAML_LIB_DIR)/findlib/topfind
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+	$(MAKE) opt
+endif
+install/$(PKGNAME)::
+	# rm ocamlc.opt and similar settings, they're not avail everywhere in debian
 	grep -v \\.opt debian/tmp/etc/ocamlfind.conf > debian/ocamlfind.conf.new
 	mv debian/ocamlfind.conf.new debian/tmp/etc/ocamlfind.conf
-
-	dh_install
 	# mv METAs from empty directories to the /META directory
-	for p in $(FINDLIB_METAS); do \
-	  mv \
-	    $(CURDIR)/debian/ocaml-findlib$(OCAML_LIB_DIR)/$$p/META \
-	    $(CURDIR)/debian/ocaml-findlib$(OCAML_LIB_DIR)/$(METAS_DIR)/META.$$p; \
-	    rmdir $(CURDIR)/debian/ocaml-findlib$(OCAML_LIB_DIR)/$$p; \
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAMLABI)/METAS
+	for p in `ls site-lib-src/`; do \
+	  mv $(CURDIR)/debian/tmp$(OCAMLLIBDIR)/$$p/META \
+	    $(CURDIR)/debian/tmp$(OCAMLLIBDIR)/METAS/META.$$p; \
+	  rmdir $(CURDIR)/debian/tmp$(OCAMLLIBDIR)/$$p/; \
 	done
-	# bugfix: install num_top_printers.cmi
-	test -f \
-	  $(CURDIR)/debian/ocaml-findlib$(OCAML_LIB_DIR)/num-top/num_top_printers.cmi || \
-	  cp num_top_printers.cmi $(CURDIR)/debian/ocaml-findlib$(OCAML_LIB_DIR)/num-top/
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	# remove 0 size file like TIMESTAMP
-	-find $(CURDIR)/debian/ocaml-findlib/usr/share/doc/ocaml-findlib/\
-	 -size 0 -exec rm {} \;
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs 
-	dh_link
-	if [ -x /usr/bin/ocamlopt ]; then dh_strip; else true; fi
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install configure

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