[Pkg-ocaml-maint-commits] r3602 - in /trunk/packages/ocamlodbc/trunk/debian: changelog control patches/00list patches/lablgtk2.dpatch patches/makefiles.dpatch rules

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Sat Mar 10 23:17:47 CET 2007 

Author: smimram
Date: Sat Mar 10 22:17:47 2007
New Revision: 3602

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3602
Log:
New upstream release.

Removed:
    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/patches/00list
    trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
    trunk/packages/ocamlodbc/trunk/debian/rules

Modified: trunk/packages/ocamlodbc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/changelog?rev=3602&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/changelog (original)
+++ trunk/packages/ocamlodbc/trunk/debian/changelog Sat Mar 10 22:17:47 2007
@@ -1,3 +1,12 @@
+ocamlodbc (2.12-1) experimental; urgency=low
+
+  * New upstream release.
+  * Removed lablgtk2.dpatch, integrated upstream.
+  * We don't need to remove rpaths anymore.
+  * Updated standards version to 3.7.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 28 Feb 2007 18:47:42 +0100
+
 ocamlodbc (2.10-5) unstable; urgency=low
 
   * Rebuild with OCaml 3.09.2.

Modified: trunk/packages/ocamlodbc/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/control?rev=3602&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/control (original)
+++ trunk/packages/ocamlodbc/trunk/debian/control Sat Mar 10 22:17:47 2007
@@ -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 (>= 3.09.1), ocaml-findlib (>= 1.0.3-1), liblablgtk2-ocaml-dev, dpatch, chrpath
+Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox (>= 3.09.1), ocaml-findlib (>= 1.0.3-1), liblablgtk2-ocaml-dev, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlodbc
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/
@@ -12,9 +12,9 @@
 Section: libdevel
 Architecture: any
 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.
+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.
 
@@ -22,9 +22,7 @@
 Section: misc
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: UnixODBC database bindings for OCaml, Biniki
- This package provides UnixODBC database bindings for the OCaml language,
- letting you access any of many different databases from within OCaml.
- .
- This package provides the graphical multi-database application
- Biniki.
+Description: Graphical, multi-database access application
+ This package provides biniki, a graphical application to run SQL queries
+ on a database over ODBC, which is part of the ocamlodbc bindings to the
+ UnixODBC library.

Modified: trunk/packages/ocamlodbc/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/patches/00list?rev=3602&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/00list Sat Mar 10 22:17:47 2007
@@ -1,2 +1,1 @@
 makefiles
-lablgtk2

Modified: trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch?rev=3602&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch (original)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch Sat Mar 10 22:17:47 2007
@@ -5,14 +5,14 @@
 ## DP: Cleaner Makefiles.
 
 @DPATCH@
-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-12-25 16:00:34.000000000 +0100
+diff -urNad ocamlodbc-2.12~/Biniki/Makefile ocamlodbc-2.12/Biniki/Makefile
+--- ocamlodbc-2.12~/Biniki/Makefile	2007-02-28 10:10:04.000000000 +0100
++++ ocamlodbc-2.12/Biniki/Makefile	2007-03-10 23:00:39.000000000 +0100
 @@ -13,11 +13,16 @@
  # Overriden flags
  
  COMPFLAGS=-nolabels -I ../$(SUBDIR) $(INCLUDEGTK)
--LINKFLAGS=-ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK) 
+-LINKFLAGS=-ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK)
 +LINKFLAGS=-ccopt -fPIC -ccopt -L../$(SUBDIR) -I ../$(SUBDIR) $(LINKGTK)
  
  ####
@@ -27,9 +27,9 @@
  
  # targets for each database
  mysql:
-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-12-25 16:01:14.000000000 +0100
+diff -urNad ocamlodbc-2.12~/Makefile ocamlodbc-2.12/Makefile
+--- ocamlodbc-2.12~/Makefile	2007-02-28 10:10:04.000000000 +0100
++++ ocamlodbc-2.12/Makefile	2007-03-10 22:59:10.000000000 +0100
 @@ -88,7 +88,7 @@
  	$(AR) $@ $(OBJFILES)
  	$(RANLIB) $@
@@ -40,7 +40,7 @@
  $(LIB_OPT): $(OBJOCAML_OPT) $(LIBOBJ_OPT) $(LIB_C)
  	$(OCAMLOPT) -a -linkall -o $(LIB_OPT) -cclib -locamlodbc $(LINKFLAGS) $(OBJOCAML_OPT) $(LIBOBJ_OPT)
 @@ -158,10 +158,10 @@
- 	@echo '  To install $(RESULT) dirctly type : "make direct_install"'
+ 	@echo '  To install directly type : "make direct_install"'
  
  direct_install: dummy
 -	if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
@@ -53,9 +53,9 @@
  
  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-12-25 16:00:34.000000000 +0100
+diff -urNad ocamlodbc-2.12~/master.Makefile.in ocamlodbc-2.12/master.Makefile.in
+--- ocamlodbc-2.12~/master.Makefile.in	2007-02-28 10:10:04.000000000 +0100
++++ ocamlodbc-2.12/master.Makefile.in	2007-03-10 22:59:10.000000000 +0100
 @@ -42,8 +42,13 @@
  MKDIR=mkdir -p
  CP=cp -f
@@ -72,7 +72,7 @@
  LIB_C=libocamlodbc.a
  LIB_CMI=$(LIB:.cma=.cmi)
  INSTALL_LIBDIR=$(OCAMLLIB)/ocamlodbc
-@@ -115,7 +120,7 @@
+@@ -116,7 +121,7 @@
  
  # Options for compilation and link
  CC       = gcc

Modified: trunk/packages/ocamlodbc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/rules?rev=3602&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/rules (original)
+++ trunk/packages/ocamlodbc/trunk/debian/rules Sat Mar 10 22:17:47 2007
@@ -82,7 +82,6 @@
 	else \
 		cp Biniki/biniki debian/tmp/usr/bin; \
 	fi
-	chrpath -d debian/tmp/usr/bin/biniki
 	install -m 644 debian/libocamlodbc-ocaml-bin.override debian/libocamlodbc-ocaml-bin/usr/share/lintian/overrides/libocamlodbc-ocaml-bin
 
 # Build architecture-independent files here.

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