[Pkg-ocaml-maint-commits] r3070 - in /trunk/packages/extlib/trunk/debian: changelog control.in rules

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Sep  6 08:04:44 2006
New Revision: 3070

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3070
Log:
sane debian/* setting

Removed:
    trunk/packages/extlib/trunk/debian/control.in
Modified:
    trunk/packages/extlib/trunk/debian/changelog
    trunk/packages/extlib/trunk/debian/rules

Modified: trunk/packages/extlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/changelog?rev=3070&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/changelog (original)
+++ trunk/packages/extlib/trunk/debian/changelog Wed Sep  6 08:04:44 2006
@@ -1,3 +1,12 @@
+extlib (1.5-5) unstable; urgency=low
+
+  * debian/rules
+    - avoid to create debian/control from debian/control.in on ocamlinit
+  * debian/control.in
+    - file removed, no longer needed
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed,  6 Sep 2006 09:44:06 +0200
+
 extlib (1.5-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/extlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/rules?rev=3070&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/rules (original)
+++ trunk/packages/extlib/trunk/debian/rules Wed Sep  6 08:04:44 2006
@@ -1,19 +1,21 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+PKGNAME = libextlib-ocaml-dev
+
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 
-OCAML_STDLIB_DIR := $(shell ocamlc -where)
-PKGNAME = libextlib-ocaml-dev
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
 PKGDIR = $(CURDIR)/debian/$(PKGNAME)
-DESTDIR = $(PKGDIR)$(OCAML_STDLIB_DIR)/extlib
+DESTDIR = $(PKGDIR)$(OCAMLLIBDIR)/extlib
 DOCDIR = $(PKGDIR)/usr/share/doc/$(PKGNAME)/
 
 include /usr/share/dpatch/dpatch.make
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
 build:
 clean: patch clean1 unpatch
@@ -26,7 +28,7 @@
 
 	dh_clean
 
-install: patch-stamp
+install: ocamlinit patch-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
@@ -53,7 +55,7 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol $(DEB_DH_GENCONTROL_ARGS)
 	dh_md5sums
 	dh_builddeb