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

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Sep  5 20:47:32 2006
New Revision: 3066

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

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

Modified: trunk/packages/findlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/changelog?rev=3066&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/changelog (original)
+++ trunk/packages/findlib/trunk/debian/changelog Tue Sep  5 20:47:32 2006
@@ -1,3 +1,13 @@
+findlib (1.1.1-6) unstable; urgency=low
+
+  * debian/rules
+    - removed no longer needed workaround for cdbs + dpatch
+    - 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>  Tue,  5 Sep 2006 22:45:17 +0200
+
 findlib (1.1.1-5) unstable; urgency=low
 
   * debian/patches/17_stddirs.dpatch:

Modified: trunk/packages/findlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/rules?rev=3066&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/rules (original)
+++ trunk/packages/findlib/trunk/debian/rules Tue Sep  5 20:47:32 2006
@@ -10,10 +10,12 @@
 OFILES = $(patsubst %.in,%,$(shell ls debian/*.in debian/patches/*.in))
 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)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
+
+DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp
 
 configure/$(PKGNAME)::
 	rm -f README # just a symlink, the good one is doc/README
@@ -44,6 +46,3 @@
 binary-install/$(PKGNAME)::
 	# rm 0 sized upstream timestamps
 	find debian/$(PKGNAME)/usr/share/doc -name TIMESTAMP -exec rm {} \;
-
-# work around cdbs' bug
-unpatch: deapply-dpatches