[Pkg-ocaml-maint-commits] r4100 - in /trunk/packages/ocamlodbc/trunk/debian: changelog patches/makefiles.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Jul 19 09:15:26 2007
New Revision: 4100

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

Modified:
    trunk/packages/ocamlodbc/trunk/debian/changelog
    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=4100&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/changelog (original)
+++ trunk/packages/ocamlodbc/trunk/debian/changelog Thu Jul 19 09:15:26 2007
@@ -1,3 +1,11 @@
+ocamlodbc (2.15-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refreshed makefile.dpatch.
+  * Don't ignore errors on clean.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Jul 2007 11:09:46 +0200
+
 ocamlodbc (2.12-2) unstable; urgency=low
 
   * Upload to unstable.

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=4100&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch (original)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch Thu Jul 19 09:15:26 2007
@@ -5,9 +5,9 @@
 ## DP: Cleaner Makefiles.
 
 @DPATCH@
-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
+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
  
@@ -27,19 +27,19 @@
  
  # targets for each database
  mysql:
-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
+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)
+ 	$(OCAMLC) -a -linkall -custom -o $@ -cclib -locamlodbc \
+ 		$(LINKFLAGS) $(OBJOCAML) $(LIBOBJ)
  $(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 @@
+@@ -160,10 +160,10 @@
  	@echo '  To install directly type : "make direct_install"'
  
  direct_install: dummy
@@ -53,9 +53,9 @@
  
  findlib_install: META dummy
  	for i in mysql postgres db2 unixodbc openingres oraclecfo ; do \
-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
+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
@@ -76,8 +76,8 @@
  
  # Options for compilation and link
  CC       = gcc
--C_COMPFLAGS= -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB) -I $(OCAMLLIB)/caml
-+C_COMPFLAGS= -fPIC -pthread $(OPTODBC) $(ODBCINCLUDE) -I $(OCAMLLIB) -I $(OCAMLLIB)/caml
+-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)

Modified: trunk/packages/ocamlodbc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/rules?rev=4100&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/rules (original)
+++ trunk/packages/ocamlodbc/trunk/debian/rules Thu Jul 19 09:15:26 2007
@@ -53,8 +53,8 @@
 	dh_testroot
 	rm -f build-stamp
 
-	-$(MAKE) clean_all
-	-$(MAKE) distclean
+	[ ! -f master.Makefile ] || $(MAKE) clean_all
+	[ ! -f master.Makefile ] || $(MAKE) distclean
 	-rm -rf unixodbc html
 
 	dh_clean