[Pkg-ocaml-maint-commits] r3054 - in /trunk/packages/pcre-ocaml: trunk/debian/changelog trunk/debian/control.in trunk/debian/patches/00list trunk/debian/rules upstream/pcre-ocaml_5.10.1.orig.tar.gz upstream/pcre-ocaml_5.11.1.orig.tar.gz

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Sep  5 19:47:36 2006
New Revision: 3054

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3054
Log:
ready for a new upload: new upstream + decent debian/* setting

Added:
    trunk/packages/pcre-ocaml/upstream/pcre-ocaml_5.11.1.orig.tar.gz   (with props)
Removed:
    trunk/packages/pcre-ocaml/trunk/debian/control.in
    trunk/packages/pcre-ocaml/upstream/pcre-ocaml_5.10.1.orig.tar.gz
Modified:
    trunk/packages/pcre-ocaml/trunk/debian/changelog
    trunk/packages/pcre-ocaml/trunk/debian/patches/00list
    trunk/packages/pcre-ocaml/trunk/debian/rules

Modified: trunk/packages/pcre-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/changelog?rev=3054&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/changelog Tue Sep  5 19:47:36 2006
@@ -1,3 +1,17 @@
+pcre-ocaml (5.11.1-1) unstable; urgency=low
+
+  * New upstream release
+  * 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
+  * debian/patches/
+    - commented out 19_meta.dpatch (not needed with this version, lib version
+      is correct in upstream's META)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue,  5 Sep 2006 21:27:53 +0200
+
 pcre-ocaml (5.10.1-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/pcre-ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/patches/00list?rev=3054&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/00list Tue Sep  5 19:47:36 2006
@@ -1,3 +1,2 @@
 17_build
-19_meta
 31_fpic

Modified: trunk/packages/pcre-ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/rules?rev=3054&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/rules (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/rules Tue Sep  5 19:47:36 2006
@@ -7,11 +7,12 @@
 
 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)"
+
 DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
 DOCDIR = $(CURDIR)/debian/doc/html
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 	DEB_MAKE_BUILD_TARGET = opt NO_CUSTOM=y
@@ -23,11 +24,9 @@
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
 build/$(PKGNAME)::
 	mkdir -p $(DESTDIR) $(DOCDIR)
 	ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
 cleanbuilddir/$(PKGNAME)::
 	rm -rf debian/doc
-
-# work around cdbs' bug
-unpatch: deapply-dpatches

Added: trunk/packages/pcre-ocaml/upstream/pcre-ocaml_5.11.1.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/upstream/pcre-ocaml_5.11.1.orig.tar.gz?rev=3054&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/pcre-ocaml/upstream/pcre-ocaml_5.11.1.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream