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

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Sep  5 20:00:26 2006
New Revision: 3057

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

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

Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=3057&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Tue Sep  5 20:00:26 2006
@@ -1,3 +1,13 @@
+ocamlnet (1.1-11) 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; it is deprecated as per ocaml packaging policy 3.3
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue,  5 Sep 2006 21:57:19 +0200
+
 ocamlnet (1.1-10) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/ocamlnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/rules?rev=3057&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules (original)
+++ trunk/packages/ocamlnet/trunk/debian/rules Tue Sep  5 20:00:26 2006
@@ -7,15 +7,17 @@
 
 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)"
+
 NETDBDESTDIR = $(OCAMLLIBDIR)/netstring
 DEB_SRCDIR = $(CURDIR)/src
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp NETDBDESTDIR=$(CURDIR)/debian/tmp/netstring
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
 
 configure/$(PKGNAME)::
 	cd src/ && ./configure -enable-compatcgi -datadir $(NETDBDESTDIR)
@@ -33,6 +35,3 @@
 clean::
 	rm -f /src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cm*
 	rm -f /src/tmp/t.cm*
-
-# work around cdbs' bug
-unpatch: deapply-dpatches