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

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Sep  6 08:04:56 2006
New Revision: 3071

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

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

Modified: trunk/packages/calendar/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/calendar/trunk/debian/changelog?rev=3071&op=diff
==============================================================================
--- trunk/packages/calendar/trunk/debian/changelog (original)
+++ trunk/packages/calendar/trunk/debian/changelog Wed Sep  6 08:04:56 2006
@@ -1,3 +1,15 @@
+calendar (1.09.3-7) 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:51:53 +0200
+
 calendar (1.09.3-6) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/calendar/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/calendar/trunk/debian/rules?rev=3071&op=diff
==============================================================================
--- trunk/packages/calendar/trunk/debian/rules (original)
+++ trunk/packages/calendar/trunk/debian/rules Wed Sep  6 08:04:56 2006
@@ -7,18 +7,19 @@
 
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+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)"
-DEB_MAKE_INSTALL_TARGET = install OCAML_LIB_DIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
+
+DEB_MAKE_INSTALL_TARGET = install OCAML_LIB_DIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
+
 configure/$(PKGNAME)::
 	./configure
 clean::
 	rm -rf debian/html/
 binary-install/$(PKGNAME)::
 	mv $(CURDIR)/debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/{doc,html}
-# work around cdbs' bug
-unpatch: deapply-dpatches