[Pkg-ocaml-maint-commits] r2082 - in trunk/packages/ocamlodbc/trunk/debian: . patches

Samuel Mimram smimram-guest at costa.debian.org
Sun Nov 20 17:04:00 UTC 2005 

Author: smimram-guest
Date: 2005-11-20 17:03:59 +0000 (Sun, 20 Nov 2005)
New Revision: 2082

Added:
   trunk/packages/ocamlodbc/trunk/debian/patches/lablgtk2.dpatch
Modified:
   trunk/packages/ocamlodbc/trunk/debian/changelog
   trunk/packages/ocamlodbc/trunk/debian/control
   trunk/packages/ocamlodbc/trunk/debian/control.in
   trunk/packages/ocamlodbc/trunk/debian/patches/00list
   trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
   trunk/packages/ocamlodbc/trunk/debian/rules
Log:
New upstream release.

Modified: trunk/packages/ocamlodbc/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/changelog	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/changelog	2005-11-20 17:03:59 UTC (rev 2082)
@@ -1,3 +1,14 @@
+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 <smimram at debian.org>  Sun, 20 Nov 2005 17:02:57 +0100
+
 ocamlodbc (2.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocamlodbc/trunk/debian/control
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/control	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/control	2005-11-20 17:03:59 UTC (rev 2082)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox-3.08.3, ocaml-findlib (>= 1.0.3-1), liblablgtk-ocaml-dev, dpatch, chrpath
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.0.3-1), liblablgtk2-ocaml-dev, dpatch, chrpath
+Standards-Version: 3.6.2
 
 Package: libocamlodbc-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, unixodbc-dev
+Depends: ocaml-nox-${F:OCamlABI}, unixodbc-dev
 Description: UnixODBC database bindings for OCaml, Development Files
  This package provides UnixODBC database bindings for the OCaml language,
  letting you access any of many different databases from within OCaml.

Modified: trunk/packages/ocamlodbc/trunk/debian/control.in
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/control.in	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/control.in	2005-11-20 17:03:59 UTC (rev 2082)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.0.3-1), liblablgtk-ocaml-dev, dpatch, chrpath
+Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.0.3-1), liblablgtk2-ocaml-dev, dpatch, chrpath
 Standards-Version: 3.6.2
 
 Package: libocamlodbc-ocaml-dev

Modified: trunk/packages/ocamlodbc/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/00list	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/00list	2005-11-20 17:03:59 UTC (rev 2082)
@@ -1 +1,2 @@
 makefiles
+lablgtk2

Added: trunk/packages/ocamlodbc/trunk/debian/patches/lablgtk2.dpatch
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/lablgtk2.dpatch	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/lablgtk2.dpatch	2005-11-20 17:03:59 UTC (rev 2082)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lablgtk2.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use lablgtk2 instead of labgtk.
+
+ at DPATCH@
+diff -urNad ocamlodbc-2.10~/Biniki/biniki_window.ml ocamlodbc-2.10/Biniki/biniki_window.ml
+--- ocamlodbc-2.10~/Biniki/biniki_window.ml	2004-03-01 11:28:28.000000000 +0100
++++ ocamlodbc-2.10/Biniki/biniki_window.ml	2005-11-20 17:31:04.000000000 +0100
+@@ -105,7 +105,7 @@
+ 	   let wcombo_queries = GEdit.combo
+ 	       ~popdown_strings: ("" :: context#history_queries)
+ 	       ~value_in_list: false
+-	       ~ok_if_empty: true
++	       ~allow_empty: true
+ 	       ~packing: (hbox#pack ~expand: true ~padding: 2)
+ 	       ()
+ 	   in
+diff -urNad ocamlodbc-2.10~/master.Makefile.in ocamlodbc-2.10/master.Makefile.in
+--- ocamlodbc-2.10~/master.Makefile.in	2005-05-13 11:42:22.000000000 +0200
++++ ocamlodbc-2.10/master.Makefile.in	2005-11-20 17:30:46.000000000 +0100
+@@ -54,10 +54,10 @@
+ 
+ #################################
+ # For Biniki
+-LABLGTKDIR=$(OCAMLLIB)/lablgtk
++LABLGTKDIR=$(OCAMLLIB)/lablgtk2
+ LIBSGTK=$(LABLGTKDIR)/lablgtk.cma $(LABLGTKDIR)/gtkInit.cmo #$(OCAMLLIB)/lablgl.cma
+ LIBSGTK_OPT=$(LABLGTKDIR)/lablgtk.cmxa $(LABLGTKDIR)/gtkInit.cmx #$(OCAMLLIB)/lablgl.cmxa
+-LINKGTK=-ccopt "${GLIB_LIBS} $(shell gtk-config --libs) -L$(LABLGTKDIR) -llablgtk "
++LINKGTK=-ccopt "${GLIB_LIBS} $(shell gtk-config --libs) -L$(LABLGTKDIR) -llablgtk2 "
+ INCLUDEGTK=  -I $(LABLGTKDIR)
+ 
+ BINIKI=biniki
+@@ -134,7 +134,7 @@
+ POSTGRES_LINKFLAGS= -ccopt "$(ODBCLIB) @POSTGRES_LIBS@ -ldopt $(ODBCLIB) @POSTGRES_LIBS@"
+ OPENINGRES_LINKFLAGS= -ccopt "$(ODBCLIB) @OPENINGRES_LIBS@ -ldopt $(ODBCLIB) @OPENINGRES_LIBS@"
+ DB2_LINKFLAGS= -ccopt "$(ODBCLIB) @DB2_LIBS@ -ldopt $(ODBCLIB) @DB2_LIBS@"
+-unixODBC_LINKFLAGS= -ccopt "$(ODBCLIB) @UNIXODBC_LIBS@ -ldopt $(ODBCLIB) @UNIXODBC_LIBS@"
++unixODBC_LINKFLAGS= -ccopt "$(ODBCLIB) @UNIXODBC_LIBS@ $(ODBCLIB) @UNIXODBC_LIBS@"
+ ORACLECFO_LINKFLAGS= -ccopt "$(ODBCLIB) @ORACLECFO_LIBS@ -ldopt $(ODBCLIB) @ORACLECFO_LIBS@"
+ 
+ LINKFLAGS= $($(BASE)_LINKFLAGS)


Property changes on: trunk/packages/ocamlodbc/trunk/debian/patches/lablgtk2.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch	2005-11-20 17:03:59 UTC (rev 2082)
@@ -5,15 +5,15 @@
 ## DP: Cleaner Makefiles.
 
 @DPATCH@
-diff -urNad ocamlodbc-2.8/Biniki/Makefile /tmp/dpep.cIZsCL/ocamlodbc-2.8/Biniki/Makefile
---- ocamlodbc-2.8/Biniki/Makefile	2004-07-27 17:09:24.000000000 +0200
-+++ /tmp/dpep.cIZsCL/ocamlodbc-2.8/Biniki/Makefile	2005-03-28 22:22:07.000000000 +0200
+diff -urNad ocamlodbc-2.10~/Biniki/Makefile ocamlodbc-2.10/Biniki/Makefile
+--- ocamlodbc-2.10~/Biniki/Makefile	2003-08-27 16:23:34.000000000 +0200
++++ ocamlodbc-2.10/Biniki/Makefile	2005-11-20 17:38:04.000000000 +0100
 @@ -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) 
++LINKFLAGS=-ccopt -fPIC -ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK)
  
  ####
  BINIKI=biniki
@@ -27,13 +27,13 @@
  
  # targets for each database
  mysql:
-diff -urNad ocamlodbc-2.8/Makefile /tmp/dpep.cIZsCL/ocamlodbc-2.8/Makefile
---- ocamlodbc-2.8/Makefile	2004-07-27 17:09:24.000000000 +0200
-+++ /tmp/dpep.cIZsCL/ocamlodbc-2.8/Makefile	2005-03-28 22:22:07.000000000 +0200
-@@ -136,10 +136,10 @@
- # installation :
- ################
- install: dummy
+diff -urNad ocamlodbc-2.10~/Makefile ocamlodbc-2.10/Makefile
+--- ocamlodbc-2.10~/Makefile	2005-05-13 13:57:36.000000000 +0200
++++ ocamlodbc-2.10/Makefile	2005-11-20 17:39:50.000000000 +0100
+@@ -158,10 +158,10 @@
+ 	@echo '  To install $(RESULT) dirctly 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
@@ -42,12 +42,12 @@
 -	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
  
- # common rules
- .depend depend::
-diff -urNad ocamlodbc-2.8/master.Makefile.in /tmp/dpep.cIZsCL/ocamlodbc-2.8/master.Makefile.in
---- ocamlodbc-2.8/master.Makefile.in	2004-07-27 17:09:24.000000000 +0200
-+++ /tmp/dpep.cIZsCL/ocamlodbc-2.8/master.Makefile.in	2005-03-28 22:22:07.000000000 +0200
-@@ -41,8 +41,13 @@
+ findlib_install: META dummy
+ 	for i in mysql postgres db2 unixodbc openingres oraclecfo ; do \
+diff -urNad ocamlodbc-2.10~/master.Makefile.in ocamlodbc-2.10/master.Makefile.in
+--- ocamlodbc-2.10~/master.Makefile.in	2005-05-13 11:42:22.000000000 +0200
++++ ocamlodbc-2.10/master.Makefile.in	2005-11-20 17:40:25.000000000 +0100
+@@ -42,8 +42,13 @@
  MKDIR=mkdir -p
  CP=cp -f
  LIB=ocamlodbc.cma
@@ -63,7 +63,7 @@
  LIB_C=libocamlodbc.a
  LIB_CMI=$(LIB:.cma=.cmi)
  INSTALL_LIBDIR=$(OCAMLLIB)/ocamlodbc
-@@ -114,7 +119,7 @@
+@@ -115,7 +120,7 @@
  
  # Options for compilation and link
  CC       = gcc

Modified: trunk/packages/ocamlodbc/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/rules	2005-11-20 15:54:37 UTC (rev 2081)
+++ trunk/packages/ocamlodbc/trunk/debian/rules	2005-11-20 17:03:59 UTC (rev 2082)
@@ -9,12 +9,16 @@
 # We want to use dpatch
 include /usr/share/dpatch/dpatch.make
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+
+DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
+
 # 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)))
@@ -26,6 +30,9 @@
 	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
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -46,33 +53,26 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 
 	-$(MAKE) clean_all
 	-cd Biniki && $(MAKE) clean_all
 	-rm -f Biniki/biniki_messages.ml config.{log,status} master.Makefile
 	-rm -rf unixodbc html
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
-	mkdir -p debian/tmp`ocamlc -where`
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr DESTDIR=$(CURDIR)/debian/tmp
-	mv -v debian/tmp/usr/lib/ocaml/*/ocamlodbc/unixodbc/* \
-		debian/tmp/usr/lib/ocaml/*
-	rmdir debian/tmp/usr/lib/ocaml/*/ocamlodbc/unixodbc
-	rmdir debian/tmp/usr/lib/ocaml/*/ocamlodbc
+	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
+	mkdir -p debian/tmp/usr/bin
 	if [ -f Biniki/biniki.opt ]; then \
 		cp Biniki/biniki.opt \
 		debian/tmp/usr/bin/biniki; \
@@ -101,9 +101,9 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install

More information about the Pkg-ocaml-maint-commits mailing list