[Pkg-ocaml-maint-commits] r1413 - in trunk/packages/pcre-ocaml/trunk/debian: . patches
Stefano Zacchiroli
zack@costa.debian.org
Sat, 25 Jun 2005 10:08:47 +0000
Author: zack
Date: 2005-06-25 10:08:47 +0000 (Sat, 25 Jun 2005)
New Revision: 1413
Added:
trunk/packages/pcre-ocaml/trunk/debian/patches/17_build.dpatch
trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch
Modified:
trunk/packages/pcre-ocaml/trunk/debian/changelog
trunk/packages/pcre-ocaml/trunk/debian/control
trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.install
trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install
trunk/packages/pcre-ocaml/trunk/debian/patches/00list
trunk/packages/pcre-ocaml/trunk/debian/rules
Log:
builds properly with svn-buildpackage + dpatch + cdbs
Modified: trunk/packages/pcre-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/changelog 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/changelog 2005-06-25 10:08:47 UTC (rev 1413)
@@ -1,3 +1,11 @@
+pcre-ocaml (5.10.0-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/*
+ - uses CDBS and dpatch
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 25 Jun 2005 09:54:05 +0200
+
pcre-ocaml (5.08.1-3) unstable; urgency=low
* Rebuilt against ocaml 3.08.3
Modified: trunk/packages/pcre-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/control 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/control 2005-06-25 10:08:47 UTC (rev 1413)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), libpcre3-dev (>= 4.5), ocaml-nox-3.08.3, ocaml-findlib
+Build-Depends: debhelper (>= 4.1.0), libpcre3-dev (>= 4.5), ocaml-nox-3.08.3, ocaml-findlib, cdbs
Standards-Version: 3.6.1.1
Package: libpcre-ocaml
Modified: trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.install
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.install 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.install 2005-06-25 10:08:47 UTC (rev 1413)
@@ -1,4 +1,4 @@
-usr/lib/ocaml/3.08.3/pcre/META usr/lib/ocaml/3.08.3/pcre/
-usr/lib/ocaml/3.08.3/pcre/*.a usr/lib/ocaml/3.08.3/pcre/
-usr/lib/ocaml/3.08.3/pcre/*.cm* usr/lib/ocaml/3.08.3/pcre/
-usr/lib/ocaml/3.08.3/pcre/*.ml* usr/lib/ocaml/3.08.3/pcre/
+debian/tmp/usr/lib/ocaml/*/pcre/META
+debian/tmp/usr/lib/ocaml/*/pcre/*.a
+debian/tmp/usr/lib/ocaml/*/pcre/*.cm*
+debian/tmp/usr/lib/ocaml/*/pcre/*.ml*
Modified: trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml.install 2005-06-25 10:08:47 UTC (rev 1413)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/pcre/dllpcre_stubs.so usr/lib/ocaml/3.08.3/stublibs/
+debian/tmp/usr/lib/ocaml/*/pcre/*.so usr/lib/ocaml/3.08.3/stublibs/
Modified: trunk/packages/pcre-ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/00list 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/00list 2005-06-25 10:08:47 UTC (rev 1413)
@@ -0,0 +1,2 @@
+17_build
+19_meta
Added: trunk/packages/pcre-ocaml/trunk/debian/patches/17_build.dpatch
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/17_build.dpatch 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/17_build.dpatch 2005-06-25 10:08:47 UTC (rev 1413)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_build.dpatch by <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.SKcYXQ/trunk/Makefile
+--- ./Makefile 2003-01-07 19:26:55.000000000 +0100
++++ /tmp/dpep-work.SKcYXQ/trunk/Makefile 2005-06-25 10:07:59.238306600 +0200
+@@ -4,7 +4,12 @@
+
+ .PHONY: all
+ all:
+- @cd lib && $(MAKE) byte-code-library native-code-library
++ @cd lib && $(MAKE) byte-code-library
++
++.PHONY: opt
++opt:
++ @cd lib && $(MAKE) byte-code-library native-code-library
++
+
+ .PHONY: examples
+ examples:
+diff -urNad --exclude=CVS --exclude=.svn ./OCamlMakefile /tmp/dpep-work.SKcYXQ/trunk/OCamlMakefile
+--- ./OCamlMakefile 2005-06-09 01:42:12.000000000 +0200
++++ /tmp/dpep-work.SKcYXQ/trunk/OCamlMakefile 2005-06-25 10:09:23.209541032 +0200
+@@ -477,8 +477,14 @@
+ endif
+
+ ifndef LIBINSTALL_FILES
+- LIBINSTALL_FILES := $(RESULT).mli $(RESULT).cmi $(RESULT).cma \
+- $(RESULT).cmxa $(RESULT).$(EXT_LIB) $(RES_CLIB)
++ ifdef NATIVE
++ LIBINSTALL_FILES := $(RESULT).mli $(RESULT).cmi $(RESULT).cma \
++ $(RESULT).cmxa $(RESULT).$(EXT_LIB) $(RES_CLIB)
++ else
++ LIBINSTALL_FILES := $(RESULT).mli $(RESULT).cmi $(RESULT).cma \
++ $(RES_CLIB)
++ endif
++
+ ifndef STATIC
+ ifneq ($(strip $(OBJ_LINK)),)
+ LIBINSTALL_FILES += $(DLLSONAME)
+@@ -1101,7 +1107,7 @@
+ .PHONY: libinstall
+ libinstall: all
+ $(QUIET)printf "\nInstalling library with ocamlfind\n"
+- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
++ $(OCAMLFIND) install -destdir $(DESTDIR) -ldconf /dev/null $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
+ $(QUIET)printf "\nInstallation successful.\n"
+
+ .PHONY: libuninstall
Property changes on: trunk/packages/pcre-ocaml/trunk/debian/patches/17_build.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch 2005-06-25 10:08:47 UTC (rev 1413)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_meta.dpatch by <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## 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
+@@ -1,5 +1,5 @@
+ name="pcre"
+-version="5.08.1"
++version="5.10.0"
+ description="Perl Compatibility Regular Expressions"
+ requires=""
+ archive(byte)="pcre.cma"
Property changes on: trunk/packages/pcre-ocaml/trunk/debian/patches/19_meta.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/pcre-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/rules 2005-06-25 07:53:37 UTC (rev 1412)
+++ trunk/packages/pcre-ocaml/trunk/debian/rules 2005-06-25 10:08:47 UTC (rev 1413)
@@ -1,67 +1,23 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+unpatch: deapply-dpatches # work around cdbs' bug
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+HAVE_OCAMLOPT = $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DOCDIR = $(CURDIR)/debian/doc/html
-include /usr/share/dpatch/dpatch.make
+ifeq ($(HAVE_OCAMLOPT),yes)
+ DEB_MAKE_BUILD_TARGET = opt NO_CUSTOM=y
+ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) NATIVE=true
+else
+ DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
+ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
+endif
-OCAMLLIB = $(shell ocamlc -where)
-DESTDIR = $(CURDIR)/debian/tmp/usr/lib/ocaml/3.08.3
-
-build: build-stamp
-build-stamp: patch-stamp
- dh_testdir
-
- $(MAKE) all NO_CUSTOM=y
- if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; else true; fi
-
- touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) clean
- rm -rf debian/doc/
- rm -f foo.ld.conf
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- mkdir -p $(DESTDIR)
- if [ -x /usr/bin/ocamlopt ]; then \
- $(MAKE) install DESTDIR=$(DESTDIR) NATIVE=true; \
- else \
- $(MAKE) install DESTDIR=$(DESTDIR); \
- fi
- dh_install --sourcedir=debian/tmp
- test -d debian/doc/html/ || mkdir -p debian/doc/html
- ocamldoc -html -m A -keep-code -d debian/doc/html lib/pcre.mli
-
-binary-arch: build install
- dh_testdir -s
- dh_testroot -s
- dh_installdocs -s
- dh_installexamples -s
- dh_installchangelogs Changes
- dh_link -s
- dh_strip -s
- dh_compress -s
- dh_fixperms -s
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+common-install-prehook-arch::
+ mkdir -p $(DESTDIR) $(DOCDIR)
+ ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
+clean::
+ rm -rf debian/doc