--- ocamlodbc-2.15.orig/debian/changelog +++ ocamlodbc-2.15/debian/changelog @@ -0,0 +1,150 @@ +ocamlodbc (2.15-5) unstable; urgency=low + + * Use dh-ocaml 0.9.1 features + * Upgrade Standards-Version to 3.8.3 (section ocaml, README.source, Homepage + field) + + -- Sylvain Le Gall Sat, 19 Dec 2009 23:29:03 +0000 + +ocamlodbc (2.15-4) unstable; urgency=low + + * Rebuild with OCaml 3.11. + * Use dh-ocaml. + * Switch packaging to git. + * Update compat to 7. + * Update standards version to 3.8.0. + + -- Samuel Mimram Thu, 05 Mar 2009 10:07:42 +0100 + +ocamlodbc (2.15-3) unstable; urgency=medium + + [ Stefano Zacchiroli ] + * fix vcs-svn field to point just above the debian/ dir + * bump urgency for the OCaml 3.10.1 transition + * add myself as an Uploader + + [ Stephane Glondu ] + * Fix FTBFS if build twice in a row (Closes: #442691) + + -- Stefano Zacchiroli Mon, 03 Mar 2008 11:44:11 +0100 + +ocamlodbc (2.15-2) unstable; urgency=low + + * Rebuild with OCaml 3.10.1 + + -- Samuel Mimram Sat, 08 Sep 2007 01:22:19 +0200 + +ocamlodbc (2.15-1) unstable; urgency=low + + * New upstream release. + * Refreshed makefile.dpatch. + * Don't ignore errors on clean. + + -- Samuel Mimram Thu, 19 Jul 2007 11:09:46 +0200 + +ocamlodbc (2.12-2) unstable; urgency=low + + * Upload to unstable. + + -- Samuel Mimram Wed, 11 Apr 2007 16:56:05 +0200 + +ocamlodbc (2.12-1) experimental; urgency=low + + * New upstream release. + * Not providing the libocamlodbc-ocaml-bin package anymore, biniki was a toy + example and is now provided as an example in libocamlodbc-ocaml-dev, + closes: #354946. + * Removed lablgtk2.dpatch, integrated upstream. + * We don't need to remove rpaths anymore. + * Updated package description. + * Updated standards version to 3.7.2, no changes needed. + + -- Samuel Mimram Wed, 28 Feb 2007 18:47:42 +0100 + +ocamlodbc (2.10-5) unstable; urgency=low + + * Rebuild with OCaml 3.09.2. + * Updated standards version to 3.7.2, no changes needed. + + -- Samuel Mimram Thu, 18 May 2006 22:52:05 +0000 + +ocamlodbc (2.10-4) unstable; urgency=low + + * Rebuild with OCaml 3.09.1. + + -- Samuel Mimram Sun, 8 Jan 2006 19:08:45 +0100 + +ocamlodbc (2.10-3) unstable; urgency=low + + * Updated makefiles.dpatch to build libocamlodbc.a and using back ocamlfind + to do the installation, closes: #340103. + * Rebuilding with binNMUed lablgtk2 on sparc, closes: #344614. + + -- Samuel Mimram Sun, 25 Dec 2005 16:03:06 +0100 + +ocamlodbc (2.10-2) unstable; urgency=low + + * Reverting to the former installation method, closes: #340103. + + -- Samuel Mimram Mon, 19 Dec 2005 21:40:27 +0100 + +ocamlodbc (2.10-1) unstable; urgency=low + + * New upstream release. + * Added lablgtk2.dpatch to use lablgtk2 instead of lablgtk and changed the + build dependencies accordingly. + * Updated makefiles.dpatch. + * No longer hardcoding OCaml's ABI in debian/* files. + * Bumped standards version to 3.6.2, no changes needed. + + -- Samuel Mimram Sun, 20 Nov 2005 17:02:57 +0100 + +ocamlodbc (2.9-1) unstable; urgency=low + + * New upstream release. + * Removed the lintian override and use chrpath to remove the rpath in + biniki. + * Added a watch file. + * Added Section:devel for source. + + -- Samuel Mimram Wed, 13 Apr 2005 12:52:48 +0200 + +ocamlodbc (2.8-3) unstable; urgency=medium + + * I forgot to fill libocamlodbc-ocaml-bin.override, closes: #302515. + + -- Samuel Mimram Fri, 1 Apr 2005 20:51:12 +0200 + +ocamlodbc (2.8-2) unstable; urgency=medium + + * New maintainer: set Debian OCaml Maintainers as new maintainer and added + myself to Uploaders. + * Rebuilding with OCaml 3.08.3. + * Updated Standards-Version to 3.6.1.1. + * Using dpatch for managing patches. + * Many cleanups in the rules (using dh_install and dh_shlibsdeps in + particular). + * Added a lintian override for OCaml rpath's problem. + + -- Samuel Mimram Mon, 28 Mar 2005 22:04:11 +0200 + +ocamlodbc (2.8-1) unstable; urgency=low + + * New upstream version. + * Updated to build with OCaml 3.08. + + -- John Goerzen Tue, 27 Jul 2004 09:07:41 -0500 + +ocamlodbc (2.7-2) unstable; urgency=low + + * Applied patch from Mike Furr to fix the build + process on platforms that lack ocamlopt. Closes: #239833. + His patch also fixes a potential -fPIC problem. + + -- John Goerzen Wed, 21 Apr 2004 11:45:18 -0500 + +ocamlodbc (2.7-1) unstable; urgency=low + + * Initial Release. Closes: #234740. + + -- John Goerzen Wed, 25 Feb 2004 09:51:15 -0600 --- ocamlodbc-2.15.orig/debian/compat +++ ocamlodbc-2.15/debian/compat @@ -0,0 +1 @@ +7 --- ocamlodbc-2.15.orig/debian/watch +++ ocamlodbc-2.15/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://download.gna.org/ocamlodbc/ocamlodbc[_-]([1-9]*)[_\.]([1-9]*).tar.gz debian uuscan --- ocamlodbc-2.15.orig/debian/control +++ ocamlodbc-2.15/debian/control @@ -0,0 +1,20 @@ +Source: ocamlodbc +Section: ocaml +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: Samuel Mimram , Stefano Zacchiroli , Sylvain Le Gall +Build-Depends: debhelper (>= 7), unixodbc-dev, unixodbc-bin, dh-ocaml (>= 0.9.1), ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), liblablgtk2-ocaml-dev (>= 2.12.0), dpatch +Standards-Version: 3.8.3 +Homepage: http://download.gna.org/ocamlodbc/ +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlodbc.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlodbc.git + +Package: libocamlodbc-ocaml-dev +Architecture: any +Depends: ${ocaml:Depends}, unixodbc-dev +Provides: ${ocaml:Provides} +Description: UnixODBC database bindings for OCaml + Bindings of the UnixODBC library for the OCaml language, letting you access + many different databases from within OCaml. + . + This package provides the development and documentation file. --- ocamlodbc-2.15.orig/debian/README.source +++ ocamlodbc-2.15/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- ocamlodbc-2.15.orig/debian/libocamlodbc-ocaml-dev.doc-base +++ ocamlodbc-2.15/debian/libocamlodbc-ocaml-dev.doc-base @@ -0,0 +1,10 @@ +Document: ocamlodbc +Title: OCamlODBC API Manual +Author: Maxence Guesdon +Abstract: Descriptions of the API for OcamlODBC, an ODBC database + library for the OCaml language. +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libocamlodbc-ocaml-dev/html/index.html +Files: /usr/share/doc/libocamlodbc-ocaml-dev/html/*.html --- ocamlodbc-2.15.orig/debian/gbp.conf +++ ocamlodbc-2.15/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- ocamlodbc-2.15.orig/debian/rules +++ ocamlodbc-2.15/debian/rules @@ -0,0 +1,94 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/ocaml/ocamlvars.mk +include /usr/share/ocaml/ocamlinit.mk +include /usr/share/dpatch/dpatch.make + +DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + +build: patch-stamp build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) depend + $(MAKE) unixodbc + -mkdir html + ocamldoc -html -d html ocamlodbc.mli + + touch build-stamp + +clean: unpatch ocamlinit-clean + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f master.Makefile ] || $(MAKE) distclean + -rm .depend + -rm -rf unixodbc html + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + mkdir -p $(DESTDIR) + $(MAKE) findlib_install prefix=$(CURDIR)/debian/tmp/usr OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore + mv $(DESTDIR)/ocamlodbc_unixodbc $(DESTDIR)/ocamlodbc + sed -e 's/ocamlodbc_unixodbc/ocamlodbc/g' $(DESTDIR)/ocamlodbc/META > $(DESTDIR)/ocamlodbc/META + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + rm -f debian/libocamlodbc-ocaml-dev/usr/share/doc/libocamlodbc-ocaml-dev/examples/Biniki/.cvsignore + dh_install --list-missing + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_ocaml + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install ocamlinit --- ocamlodbc-2.15.orig/debian/libocamlodbc-ocaml-dev.install +++ ocamlodbc-2.15/debian/libocamlodbc-ocaml-dev.install @@ -0,0 +1 @@ +usr/lib/ocaml/* --- ocamlodbc-2.15.orig/debian/README.Debian +++ ocamlodbc-2.15/debian/README.Debian @@ -0,0 +1,16 @@ +ocamlodbc for Debian +-------------------- + +To build a file -- say the monitor example -- with bytecode: + +ocamlc ocamlodbc.cma monitor.ml -o monitor + +Or, natively: + +ocamlopt ocamlodbc.cmxa monitor.ml -o monitor + +Note that OcamlODBC does not presently provide a shared library, so even with +the first option, you will get an ELF executable. So I suggest using the +native mode if possible. + + -- John Goerzen , Wed, 25 Feb 2004 09:51:15 -0600 --- ocamlodbc-2.15.orig/debian/copyright +++ ocamlodbc-2.15/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by John Goerzen on +Wed, 25 Feb 2004 09:51:15 -0600. + +It was downloaded from +http://download.gna.org/ocamlodbc/ + +Upstream Author: Maxence Guesdon + +OCamlODBC: + Copyright (C) 2004 Institut National de Recherche en Informatique et + en Automatique. All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + OCamlODBC is under Lesser GPL. A copy of this licence can be found in the + file /usr/share/common-licenses/LGPL. + +Biniki: + Copyright (C) 2004 Institut National de Recherche en Informatique et + en Automatique. All rights reserved. + + Biniki, the example which uses OCamlODBC, is under GPL. A copy of this + licence can be found in the file /usr/share/common-licenses/GPL. + +Examples: + Copyright (C) 2004 Institut National de Recherche en Informatique et + en Automatique. All rights reserved. + + The examples (in directory Exemples) which use OCamlODBC, are under GPL. A + copy of this licence can be found in the file /usr/share/common-licenses/GPL. --- ocamlodbc-2.15.orig/debian/libocamlodbc-ocaml-dev.docs +++ ocamlodbc-2.15/debian/libocamlodbc-ocaml-dev.docs @@ -0,0 +1 @@ +html --- ocamlodbc-2.15.orig/debian/libocamlodbc-ocaml-dev.examples +++ ocamlodbc-2.15/debian/libocamlodbc-ocaml-dev.examples @@ -0,0 +1,2 @@ +Exemples/*.ml +Biniki --- ocamlodbc-2.15.orig/debian/patches/00list +++ ocamlodbc-2.15/debian/patches/00list @@ -0,0 +1 @@ +makefiles --- ocamlodbc-2.15.orig/debian/patches/makefiles.dpatch +++ ocamlodbc-2.15/debian/patches/makefiles.dpatch @@ -0,0 +1,83 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## makefiles.dpatch by John Goerzen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleaner Makefiles. + +@DPATCH@ +diff -urNad ocamlodbc-2.15~/Biniki/Makefile ocamlodbc-2.15/Biniki/Makefile +--- ocamlodbc-2.15~/Biniki/Makefile 2007-07-19 11:04:46.000000000 +0200 ++++ ocamlodbc-2.15/Biniki/Makefile 2007-07-19 11:04:58.000000000 +0200 +@@ -13,11 +13,16 @@ + # Overriden flags + + COMPFLAGS=-nolabels -I ../$(SUBDIR) $(INCLUDEGTK) +-LINKFLAGS=-ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK) ++LINKFLAGS=-ccopt -fPIC -ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK) + + #### + BINIKI=biniki +-BINIKI_OPT=biniki.opt ++ ++ifeq ($(OCAMLOPT),no) ++ BINIKI_OPT= ++else ++ BINIKI_OPT=biniki.opt ++endif + + # targets for each database + mysql: +diff -urNad ocamlodbc-2.15~/Makefile ocamlodbc-2.15/Makefile +--- ocamlodbc-2.15~/Makefile 2007-07-19 11:04:46.000000000 +0200 ++++ ocamlodbc-2.15/Makefile 2007-07-19 11:05:54.000000000 +0200 +@@ -88,7 +88,7 @@ + $(AR) $@ $(OBJFILES) + $(RANLIB) $@ + +-$(LIB): $(OBJOCAML) $(LIBOBJ) ++$(LIB): $(OBJOCAML) $(LIBOBJ) $(LIB_C) + $(OCAMLC) -a -linkall -custom -o $@ -cclib -locamlodbc \ + $(LINKFLAGS) $(OBJOCAML) $(LIBOBJ) + $(LIB_OPT): $(OBJOCAML_OPT) $(LIBOBJ_OPT) $(LIB_C) +@@ -160,10 +160,10 @@ + @echo ' To install directly type : "make direct_install"' + + direct_install: dummy +- if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi +- if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi ++ if test -d $(DESTDIR)/$(INSTALL_BINDIR); then : ; else $(MKDIR) $(DESTDIR)/$(INSTALL_BINDIR); fi ++ if test -d $(DESTDIR)/$(INSTALL_LIBDIR); then : ; else $(MKDIR) $(DESTDIR)/$(INSTALL_LIBDIR); fi + for i in mysql postgres db2 unixodbc openingres oraclecfo ; \ +- do (if test -d $$i ; then ($(MKDIR) $(INSTALL_LIBDIR)/$$i ; $(CP) $$i/* $(INSTALL_LIBDIR)/$$i/) fi) ; done ++ do (if test -d $$i ; then ($(MKDIR) $(DESTDIR)/$(INSTALL_LIBDIR)/$$i ; $(CP) $$i/* $(DESTDIR)/$(INSTALL_LIBDIR)/$$i/) fi) ; done + + findlib_install: META dummy + for i in mysql postgres db2 unixodbc openingres oraclecfo ; do \ +diff -urNad ocamlodbc-2.15~/master.Makefile.in ocamlodbc-2.15/master.Makefile.in +--- ocamlodbc-2.15~/master.Makefile.in 2007-07-19 11:04:46.000000000 +0200 ++++ ocamlodbc-2.15/master.Makefile.in 2007-07-19 11:06:57.000000000 +0200 +@@ -42,8 +42,13 @@ + MKDIR=mkdir -p + CP=cp -f + LIB=ocamlodbc.cma +-LIB_OPT=$(LIB:.cma=.cmxa) +-LIB_A=ocamlodbc.a ++ifeq ($(OCAMLOPT),no) ++ LIB_OPT= ++ LIB_A= ++else ++ LIB_OPT=$(LIB:.cma=.cmxa) ++ LIB_A=ocamlodbc.a ++endif + LIB_C=libocamlodbc.a + LIB_CMI=$(LIB:.cma=.cmi) + INSTALL_LIBDIR=$(OCAMLLIB)/ocamlodbc +@@ -116,7 +121,7 @@ + + # Options for compilation and link + CC = gcc +-C_COMPFLAGS= -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB) ++C_COMPFLAGS= -fPIC -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB) + + #MYSQL_C_LINKFLAGS= -L$(ODBCLIB) -L$(ODBCLIB)/mysql + #POSTGRES_C_LINKFLAGS=-L$(ODBCLIB)