[Pkg-ocaml-maint-commits] r1148 - in packages/ocaml-sqlite/trunk: . debian debian/patches
Samuel Mimram
smimram-guest@costa.debian.org
Wed, 30 Mar 2005 23:31:32 +0000
Author: smimram-guest
Date: 2005-03-30 23:31:31 +0000 (Wed, 30 Mar 2005)
New Revision: 1148
Added:
packages/ocaml-sqlite/trunk/debian/patches/
packages/ocaml-sqlite/trunk/debian/patches/00list
packages/ocaml-sqlite/trunk/debian/patches/makefile.dpatch
Modified:
packages/ocaml-sqlite/trunk/debian/changelog
packages/ocaml-sqlite/trunk/debian/control
packages/ocaml-sqlite/trunk/debian/rules
packages/ocaml-sqlite/trunk/ocaml-sqlite_0.3.5.arch.4.orig.tar.gz
Log:
Adopting package + updated to OCaml 3.08.3
Modified: packages/ocaml-sqlite/trunk/debian/changelog
===================================================================
--- packages/ocaml-sqlite/trunk/debian/changelog 2005-03-30 23:31:06 UTC (rev 1147)
+++ packages/ocaml-sqlite/trunk/debian/changelog 2005-03-30 23:31:31 UTC (rev 1148)
@@ -1,3 +1,13 @@
+ocaml-sqlite (0.3.5.arch.4-4) unstable; urgency=medium
+
+ * New Maintainer: Debian OCaml Maintainers, added myself to uploaders.
+ * Updated for OCaml 3.08.3.
+ * Using dpatch for handling patches.
+ * Updated Standards-Version to 3.6.1.1.
+ * Cleaned up the package (using dh_shlibsdep in paritcular).
+
+ -- Samuel Mimram <smimram@debian.org> Thu, 31 Mar 2005 00:55:35 +0200
+
ocaml-sqlite (0.3.5.arch.4-3) unstable; urgency=low
* Rebuilt for OCaml 3.08.
Modified: packages/ocaml-sqlite/trunk/debian/control
===================================================================
--- packages/ocaml-sqlite/trunk/debian/control 2005-03-30 23:31:06 UTC (rev 1147)
+++ packages/ocaml-sqlite/trunk/debian/control 2005-03-30 23:31:31 UTC (rev 1148)
@@ -1,9 +1,10 @@
Source: ocaml-sqlite
Section: libdevel
Priority: optional
-Maintainer: John Goerzen <jgoerzen@complete.org>
-Build-Depends: debhelper (>= 4.0.0), autoconf (>= 2.50), libsqlite0-dev (>= 2.8.1), ocaml (>= 3.08), ocaml-findlib (>= 1.0.4-1)
-Standards-Version: 3.6.0
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Samuel Mimram <smimram@debian.org>
+Build-Depends: debhelper (>= 4.0.0), autoconf (>= 2.50), libsqlite0-dev (>= 2.8.1), ocaml-nox-3.08.3, ocaml-findlib (>= 1.0.4-1), dpatch
+Standards-Version: 3.6.1.1
Package: libsqlite-ocaml-dev
Architecture: any
@@ -20,7 +21,7 @@
Package: libsqlite-ocaml
Section: libs
Architecture: any
-Depends: ocaml (>= 3.08), ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-3.08.3, ${shlibs:Depends}
Description: Embeddable SQL Database for OCaml Programs
This package provides an interface for the SQLite embeddable SQL
database. It allows your OCaml programs to use a SQL database without
Added: packages/ocaml-sqlite/trunk/debian/patches/00list
===================================================================
--- packages/ocaml-sqlite/trunk/debian/patches/00list 2005-03-30 23:31:06 UTC (rev 1147)
+++ packages/ocaml-sqlite/trunk/debian/patches/00list 2005-03-30 23:31:31 UTC (rev 1148)
@@ -0,0 +1 @@
+makefile
Added: packages/ocaml-sqlite/trunk/debian/patches/makefile.dpatch
===================================================================
--- packages/ocaml-sqlite/trunk/debian/patches/makefile.dpatch 2005-03-30 23:31:06 UTC (rev 1147)
+++ packages/ocaml-sqlite/trunk/debian/patches/makefile.dpatch 2005-03-30 23:31:31 UTC (rev 1148)
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile.dpatch by John Goerzen <jgoerzen@complete.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Cleaner installation in Makefile + using -fPIC.
+
+@DPATCH@
+diff -urNad ocaml-sqlite-0.3.5.arch.4/Makefile.in /tmp/dpep.d4XpFo/ocaml-sqlite-0.3.5.arch.4/Makefile.in
+--- ocaml-sqlite-0.3.5.arch.4/Makefile.in 2004-04-22 21:32:02.000000000 +0200
++++ /tmp/dpep.d4XpFo/ocaml-sqlite-0.3.5.arch.4/Makefile.in 2005-03-31 01:05:38.000000000 +0200
+@@ -5,7 +5,7 @@
+ bindir=@bindir@
+
+ CC=@CC@
+-CFLAGS=@CPPFLAGS@ @CFLAGS@
++CFLAGS=@CPPFLAGS@ @CFLAGS@ -fPIC
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+
+@@ -14,8 +14,10 @@
+ MKLIBFLAGS=-linkall
+
+ INSTALL=@INSTALL@
++DESTDIR=
+
+-all: bytecode opt docs
++allopt: bytecode opt docs
++all: bytecode docs
+
+ docs:
+ if [ ! -d doc ]; then mkdir doc; fi
+@@ -33,10 +35,14 @@
+
+ # install rebuilds sqlitetop to point to the findlib-managed dll and not the
+ # one in .
+-install: sqlite.cma sqlite.cmxa sqlitetop
+- ocamlfind install sqlite META sqlite.cmi sqlite.mli sqlite.cma *.cmxa *.a *.cmx *.so
+- ocamlfind ocamlmktop -o sqlitetop -package "sqlite" sqlite.cma
+- $(INSTALL) sqlitetop $(bindir)/sqlitetop
++
++install: sqlite.cma sqlitetop
++ ocamlfind install -destdir $(DESTDIR)`ocamlc -where` sqlite META sqlite.cmi sqlite.mli sqlite.cma *.a *.so
++ $(INSTALL) sqlitetop $(DESTDIR)/$(bindir)/sqlitetop
++
++installopt: sqlite.cma sqlite.cmxa sqlitetop
++ ocamlfind install -destdir $(DESTDIR)`ocamlc -where` sqlite META sqlite.cmi sqlite.mli sqlite.cma *.cmxa *.a *.cmx *.so
++ $(INSTALL) sqlitetop $(DESTDIR)/$(bindir)/sqlitetop
+
+ remove: uninstall
+ uninstall:
Property changes on: packages/ocaml-sqlite/trunk/debian/patches/makefile.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/ocaml-sqlite/trunk/debian/rules
===================================================================
--- packages/ocaml-sqlite/trunk/debian/rules 2005-03-30 23:31:06 UTC (rev 1147)
+++ packages/ocaml-sqlite/trunk/debian/rules 2005-03-30 23:31:31 UTC (rev 1148)
@@ -6,6 +6,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# We want to use dpatch
+include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -26,28 +28,23 @@
config.status: configure.ac
dh_testdir
- # Add here commands to configure the package.
autoconf
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-build: build-stamp
-
+build: patch-stamp build-stamp
build-stamp: config.status
dh_testdir
- # Add here commands to compile the package.
if [ -x /usr/bin/ocamlopt ]; then $(MAKE) allopt; else $(MAKE) all; fi
- #usr/bin/docbook-to-man debian/ocaml-sqlite.sgml > ocaml-sqlite.1
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
- # Add here commands to clean up after the build process.
-$(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -70,12 +67,16 @@
dh_installdirs
echo `ocamlc -where` | sed -e 's.^/..' -e 's.$$./*.' > debian/libsqlite-ocaml.files
- # Add here commands to install the package into debian/ocaml-sqlite.
mkdir -p debian/libsqlite-ocaml-dev/`ocamlc -where`/stublibs
mkdir -p debian/libsqlite-ocaml/`ocamlc -where`
- if [ -x /usr/bin/ocamlopt ]; then $(MAKE) installopt DESTDIR=$(DESTDIR); else $(MAKE) install DESTDIR=$(DESTDIR); fi
+ if [ -x /usr/bin/ocamlopt ]; then \
+ $(MAKE) installopt DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore; \
+ else \
+ $(MAKE) install DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore; \
+ fi
#cp dll*.so debian/libsqlite-ocaml-dev/`ocamlc -where`/stublibs/
mv $(DESTDIR)/`ocamlc -where`/stublibs debian/libsqlite-ocaml/`ocamlc -where`/
+ rm -f debian/libsqlite-ocaml/`ocamlc -where`/stublibs/dllsqlite.so.owner
mv $(DESTDIR)/usr/bin/ debian/libsqlite-ocaml/usr
@@ -90,25 +91,13 @@
dh_installchangelogs CHANGES
dh_installdocs
dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
+ dh_install
dh_installman
dh_link
- # dh_strip is broken on this package!
- #dh_strip
+ dh_strip -Xsqlitetop
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
+ dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
Modified: packages/ocaml-sqlite/trunk/ocaml-sqlite_0.3.5.arch.4.orig.tar.gz
===================================================================
(Binary files differ)