[Pkg-ocaml-maint-commits] r4267 - in /trunk/packages/pcre-ocaml/trunk/debian: changelog control libpcre-ocaml-dev.doc-base libpcre-ocaml-dev.docs patches/build.dpatch rules
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sun Sep 2 14:54:29 UTC 2007
Author: zack
Date: Sun Sep 2 14:54:29 2007
New Revision: 4267
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4267
Log:
* debian/rules
- use CDBS class support for generating the API reference via ocamldoc
instead of doing that by hand. Remove doc-base entry for the HTML API
reference; this is a bit of a regression, but in the future the doc-base
entries will be automatically generated by CDBS
* debian/control
- bump dep on ocaml-nox to 3.10.0-7, since we now use latest stuff of the
CDBS class
* debian/patches/build.dpatch
- ensure DESTDIR is created before attempting to install there with
findlib (apparently needed starting from this upstream version)
Removed:
trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.doc-base
Modified:
trunk/packages/pcre-ocaml/trunk/debian/changelog
trunk/packages/pcre-ocaml/trunk/debian/control
trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.docs
trunk/packages/pcre-ocaml/trunk/debian/patches/build.dpatch
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=4267&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/changelog Sun Sep 2 14:54:29 2007
@@ -2,8 +2,19 @@
* new upstream release
* bump debhelper dep and compatibility level to 5
-
- -- Stefano Zacchiroli <zack at debian.org> Sun, 02 Sep 2007 16:20:08 +0200
+ * debian/rules
+ - use CDBS class support for generating the API reference via ocamldoc
+ instead of doing that by hand. Remove doc-base entry for the HTML API
+ reference; this is a bit of a regression, but in the future the doc-base
+ entries will be automatically generated by CDBS
+ * debian/control
+ - bump dep on ocaml-nox to 3.10.0-7, since we now use latest stuff of the
+ CDBS class
+ * debian/patches/build.dpatch
+ - ensure DESTDIR is created before attempting to install there with
+ findlib (apparently needed starting from this upstream version)
+
+ -- Stefano Zacchiroli <zack at debian.org> Sun, 02 Sep 2007 16:39:34 +0200
pcre-ocaml (5.11.4-1) experimental; urgency=low
Modified: trunk/packages/pcre-ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/control?rev=4267&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/control (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/control Sun Sep 2 14:54:29 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libpcre3-dev (>= 4.5), ocaml-nox (>= 3.09.2-7), ocaml-findlib (>= 1.1), cdbs, dpatch
+Build-Depends: debhelper (>= 5.0.0), libpcre3-dev (>= 4.5), ocaml-nox (>= 3.10.0-7), ocaml-findlib (>= 1.1), cdbs, dpatch
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pcre-ocaml
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/
Modified: trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.docs?rev=4267&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.docs (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/libpcre-ocaml-dev.docs Sun Sep 2 14:54:29 2007
@@ -1,2 +1,1 @@
README
-debian/doc/html
Modified: trunk/packages/pcre-ocaml/trunk/debian/patches/build.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/trunk/debian/patches/build.dpatch?rev=4267&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/build.dpatch (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/build.dpatch Sun Sep 2 14:54:29 2007
@@ -5,27 +5,27 @@
## 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 @@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile 2007-08-27 05:20:48.000000000 +0200
++++ trunk/Makefile 2007-09-02 16:36:17.000000000 +0200
+@@ -4,8 +4,13 @@
.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
+ @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 @@
+ @for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
+diff -urNad trunk~/OCamlMakefile trunk/OCamlMakefile
+--- trunk~/OCamlMakefile 2007-08-27 05:20:48.000000000 +0200
++++ trunk/OCamlMakefile 2007-09-02 16:37:08.000000000 +0200
+@@ -498,8 +498,14 @@
endif
ifndef LIBINSTALL_FILES
@@ -42,11 +42,12 @@
ifndef STATIC
ifneq ($(strip $(OBJ_LINK)),)
LIBINSTALL_FILES += $(DLLSONAME)
-@@ -1101,7 +1107,7 @@
+@@ -1138,7 +1144,8 @@
.PHONY: libinstall
libinstall: all
$(QUIET)printf "\nInstalling library with ocamlfind\n"
- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
++ mkdir -p $(DESTDIR)
+ $(OCAMLFIND) install -destdir $(DESTDIR) -ldconf /dev/null $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
$(QUIET)printf "\nInstallation successful.\n"
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=4267&op=diff
==============================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/rules (original)
+++ trunk/packages/pcre-ocaml/trunk/debian/rules Sun Sep 2 14:54:29 2007
@@ -7,6 +7,7 @@
PKGNAME = libpcre-ocaml-dev
DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
DOCDIR = $(CURDIR)/debian/doc/html
+OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
DEB_MAKE_BUILD_TARGET = opt NO_CUSTOM=y
@@ -16,9 +17,3 @@
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
endif
-build/$(PKGNAME)::
- mkdir -p $(DESTDIR) $(DOCDIR)
- ocamldoc -html -m A -keep-code -d $(DOCDIR) lib/pcre.mli
-clean::
- rm -rf debian/doc ocamldoc-stamp
-
More information about the Pkg-ocaml-maint-commits
mailing list