[Pkg-ocaml-maint-commits] r2011 - in trunk/packages/pcre-ocaml/trunk/debian: . patches

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-13 00:08:37 +0000 (Sun, 13 Nov 2005)
New Revision: 2011

Modified:
   trunk/packages/pcre-ocaml/trunk/debian/changelog
   trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch
   trunk/packages/pcre-ocaml/trunk/debian/rules
Log:
3.09 transition


Modified: trunk/packages/pcre-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/changelog	2005-11-12 18:43:37 UTC (rev 2010)
+++ trunk/packages/pcre-ocaml/trunk/debian/changelog	2005-11-13 00:08:37 UTC (rev 2011)
@@ -1,11 +1,13 @@
-pcre-ocaml (5.10.1-1) UNRELEASED; urgency=low
+pcre-ocaml (5.10.1-1) unstable; urgency=low
 
   * New upstream release
   * rebuilt with ocaml 3.09
+  * debian/*
+    - no more hardcoding of ocaml abi anywhere
   * debian/control
     - bumped standards-version
-  * debian/*
-    - no more hardcoding of ocaml abi anywhere
+  * debian/patches/19_meta.dpatch
+    - bumped lib version in META
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue,  8 Nov 2005 23:08:44 +0100
 

Modified: trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch	2005-11-12 18:43:37 UTC (rev 2010)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch	2005-11-13 00:08:37 UTC (rev 2011)
@@ -5,13 +5,13 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./lib/META /tmp/dpep-work.yS7K2J/trunk/lib/META
---- ./lib/META	2004-05-19 12:35:36.000000000 +0200
-+++ /tmp/dpep-work.yS7K2J/trunk/lib/META	2005-06-25 11:49:16.836357288 +0200
+diff -urNad trunk~/lib/META trunk/lib/META
+--- trunk~/lib/META	2004-05-19 10:35:36.000000000 +0000
++++ trunk/lib/META	2005-11-13 00:07:14.000000000 +0000
 @@ -1,5 +1,5 @@
  name="pcre"
 -version="5.08.1"
-+version="5.10.0"
++version="5.10.1"
  description="Perl Compatibility Regular Expressions"
  requires=""
  archive(byte)="pcre.cma"

Modified: trunk/packages/pcre-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/rules	2005-11-12 18:43:37 UTC (rev 2010)
+++ trunk/packages/pcre-ocaml/trunk/debian/rules	2005-11-13 00:08:37 UTC (rev 2011)
@@ -3,10 +3,13 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
+PKGNAME = libpcre-ocaml-dev
+
 OCAMLABI := $(shell ocamlc -version)
+OCAMLLIBDIR := $(shell ocamlc -where)
 OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
 HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DESTDIR := $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DESTDIR := $(CURDIR)/debian/tmp$(OCAMLLIBDIR)
 DOCDIR = $(CURDIR)/debian/doc/html
 DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 
@@ -18,14 +21,13 @@
 	DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 endif
 
-build/libpcre-ocaml-dev::
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
+build/$(PKGNAME)::
 	mkdir -p $(DESTDIR) $(DOCDIR)
 	ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
-cleanbuilddir/libpcre-ocaml-dev::
+cleanbuilddir/$(PKGNAME)::
 	rm -rf debian/doc
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
 
 # work around cdbs' bug
 unpatch: deapply-dpatches
-