[Pkg-ocaml-maint-commits] r3069 - in /trunk/packages/xstr/trunk/debian: changelog control.in dirs rules

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Sep  6 08:04:36 2006
New Revision: 3069

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

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

Modified: trunk/packages/xstr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xstr/trunk/debian/changelog?rev=3069&op=diff
==============================================================================
--- trunk/packages/xstr/trunk/debian/changelog (original)
+++ trunk/packages/xstr/trunk/debian/changelog Wed Sep  6 08:04:36 2006
@@ -1,3 +1,15 @@
+xstr (0.2.1-15) unstable; urgency=low
+
+  * debian/rules
+    - removed no longer needed workaround for cdbs + dpatch
+    - avoid to create debian/control from debian/control.in on ocamlinit
+    - removed from the source package files which are generated at build time
+      from the corresponding .in files
+  * debian/control.in
+    - file removed, no longer needed
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed,  6 Sep 2006 09:38:54 +0200
+
 xstr (0.2.1-14) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/xstr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xstr/trunk/debian/rules?rev=3069&op=diff
==============================================================================
--- trunk/packages/xstr/trunk/debian/rules (original)
+++ trunk/packages/xstr/trunk/debian/rules Wed Sep  6 08:04:36 2006
@@ -6,18 +6,18 @@
 PKGNAME = libxstr-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")
-OCAMLLIBDIR := $(shell ocamlc -where)
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAMLLIBDIR)
 DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
+
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAMLLIBDIR)
+
 ifeq ($(HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) opt
 endif
-
-# work around cdbs' bug
-unpatch: deapply-dpatches