Author: smimram
Date: Thu Feb 19 08:20:32 2009
New Revision: 6199
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6199
Log:
Uploading to exp.
Modified:
trunk/packages/mysql-ocaml/trunk/debian/changelog
trunk/packages/mysql-ocaml/trunk/debian/compat
trunk/packages/mysql-ocaml/trunk/debian/control
trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in
trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in
trunk/packages/mysql-ocaml/trunk/debian/rules
Modified: trunk/packages/mysql-ocaml/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/debian/changelog?rev=6199&op=diff
==============================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/mysql-ocaml/trunk/debian/changelog Thu Feb 19 08:20:32 2009
@@ -1,4 +1,4 @@
-mysql-ocaml (1.0.4-5) UNRELEASED; urgency=low
+mysql-ocaml (1.0.4-5) experimental; urgency=low
[ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
@@ -6,7 +6,12 @@
[ Ralf Treinen ]
* Changed doc-base section to Programming/OCaml
- -- Ralf Treinen <[email protected]> Fri, 16 May 2008 21:34:54 +0200
+ [ Samuel Mimram ]
+ * Build-depend on dh-ocaml and use predefined variables in rules.
+ * Update compat to 7.
+ * Update stardards version to 3.8.0.
+
+ -- Samuel Mimram <[email protected]> Thu, 19 Feb 2009 09:14:08 +0100
mysql-ocaml (1.0.4-4) unstable; urgency=low
Modified: trunk/packages/mysql-ocaml/trunk/debian/compat
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/debian/compat?rev=6199&op=diff
==============================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/compat (original)
+++ trunk/packages/mysql-ocaml/trunk/debian/compat Thu Feb 19 08:20:32 2009
@@ -1,1 +1,1 @@
-4
+7
Modified: trunk/packages/mysql-ocaml/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/debian/control?rev=6199&op=diff
==============================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/control (original)
+++ trunk/packages/mysql-ocaml/trunk/debian/control Thu Feb 19 08:20:32 2009
@@ -2,8 +2,8 @@
Section: devel
Priority: optional
Maintainer: Samuel Mimram <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), libmysqlclient15-dev, ocaml-nox (>=
3.09.1), camlp4, ocaml-findlib, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), libmysqlclient15-dev, ocaml-nox (>= 3.11),
camlp4, ocaml-findlib, dpatch, dh-ocaml (>= 0.2)
+Standards-Version: 3.8.0
Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/
Modified: trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in?rev=6199&op=diff
==============================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in
(original)
+++ trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml-dev.install.in Thu
Feb 19 08:20:32 2009
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/mysql/META
-usr/lib/ocaml/@OCamlABI@/mysql/*.a
-usr/lib/ocaml/@OCamlABI@/mysql/*.cm*
-usr/lib/ocaml/@OCamlABI@/mysql/*.ml*
+...@ocamlstdlibdir@/mysql/META
+...@ocamlstdlibdir@/mysql/*.a
+...@ocamlstdlibdir@/mysql/*.cm*
+...@ocamlstdlibdir@/mysql/*.ml*
Modified: trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in?rev=6199&op=diff
==============================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in (original)
+++ trunk/packages/mysql-ocaml/trunk/debian/libmysql-ocaml.install.in Thu Feb
19 08:20:32 2009
@@ -1,1 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/mysql/dllmysql_stubs.so
usr/lib/ocaml/@OCamlABI@/stublibs/
+...@ocamlstdlibdir@/mysql/dllmysql_stubs.so @OCamlDllDir@
Modified: trunk/packages/mysql-ocaml/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mysql-ocaml/trunk/debian/rules?rev=6199&op=diff
==============================================================================
--- trunk/packages/mysql-ocaml/trunk/debian/rules (original)
+++ trunk/packages/mysql-ocaml/trunk/debian/rules Thu Feb 19 08:20:32 2009
@@ -3,14 +3,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
+
# We want to use dpatch
include /usr/share/dpatch/dpatch.make
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-OCAML_LIB_DIR = $(shell ocamlc -where)
-DESTDIR = $(CURDIR)/debian/tmp$(OCAML_LIB_DIR)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
CFLAGS = -Wall -g -fPIC
@@ -22,9 +21,6 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-
-ocamlinit:
- for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in >
$$f; done
config.status: configure
dh_testdir
@@ -47,13 +43,14 @@
[ ! -f Makefile ] || $(MAKE) clean
rm -f config.log config.status
+ rm -f $(OCAML_IN_FILES)
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
mkdir -p $(DESTDIR)
@@ -78,7 +75,7 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
dh_md5sums
dh_builddeb
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
