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

Samuel Mimram smimram-guest@costa.debian.org
Wed, 30 Mar 2005 22:39:45 +0000 

Author: smimram-guest
Date: 2005-03-30 22:39:45 +0000 (Wed, 30 Mar 2005)
New Revision: 1141

Added:
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.dirs
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.install
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.install
   packages/ocamlodbc/trunk/debian/patches/
   packages/ocamlodbc/trunk/debian/patches/00list
Removed:
   packages/ocamlodbc/trunk/debian/dirs
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.files
   packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.files
Modified:
   packages/ocamlodbc/trunk/debian/README.Debian
   packages/ocamlodbc/trunk/debian/changelog
   packages/ocamlodbc/trunk/debian/control
   packages/ocamlodbc/trunk/debian/copyright
   packages/ocamlodbc/trunk/debian/rules
Log:
Package adopted. It's now ready for OCaml 3.08.3.

Modified: packages/ocamlodbc/trunk/debian/README.Debian
===================================================================
--- packages/ocamlodbc/trunk/debian/README.Debian	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/README.Debian	2005-03-30 22:39:45 UTC (rev 1141)
@@ -10,7 +10,7 @@
 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 exetuable.  So I suggest using the
+the first option, you will get an ELF executable.  So I suggest using the
 native mode if possible.
 
  -- John Goerzen <jgoerzen@complete.org>, Wed, 25 Feb 2004 09:51:15 -0600

Modified: packages/ocamlodbc/trunk/debian/changelog
===================================================================
--- packages/ocamlodbc/trunk/debian/changelog	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/changelog	2005-03-30 22:39:45 UTC (rev 1141)
@@ -1,3 +1,16 @@
+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 <smimram@debian.org>  Mon, 28 Mar 2005 22:04:11 +0200
+
 ocamlodbc (2.8-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/ocamlodbc/trunk/debian/control
===================================================================
--- packages/ocamlodbc/trunk/debian/control	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/control	2005-03-30 22:39:45 UTC (rev 1141)
@@ -1,13 +1,14 @@
 Source: ocamlodbc
 Priority: optional
-Maintainer: John Goerzen <jgoerzen@complete.org>
-Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml (>= 3.08), ocaml-findlib (>= 1.0.3-1), liblablgtk-ocaml-dev
-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), unixodbc-dev, unixodbc-bin, ocaml-nox-3.08.3, ocaml-findlib (>= 1.0.3-1), liblablgtk-ocaml-dev, dpatch
+Standards-Version: 3.6.1.1
 
 Package: libocamlodbc-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml (>= 3.08), unixodbc-dev
+Depends: ocaml-nox-3.08.3, 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.
@@ -17,7 +18,7 @@
 Package: libocamlodbc-ocaml-bin
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+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.

Modified: packages/ocamlodbc/trunk/debian/copyright
===================================================================
--- packages/ocamlodbc/trunk/debian/copyright	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/copyright	2005-03-30 22:39:45 UTC (rev 1141)
@@ -4,7 +4,7 @@
 It was downloaded from 
 http://download.gna.org/ocamlodbc/
 
-Upstream Author(s): Maxence Guesdon <Maxence.Guesdon@inria.fr>
+Upstream Author: Maxence Guesdon <Maxence.Guesdon@inria.fr>
 
 OCamlODBC:
   Copyright (C) 2004 Institut National de Recherche en Informatique et

Deleted: packages/ocamlodbc/trunk/debian/dirs
===================================================================
--- packages/ocamlodbc/trunk/debian/dirs	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/dirs	2005-03-30 22:39:45 UTC (rev 1141)
@@ -1 +0,0 @@
-usr/bin

Copied: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.dirs (from rev 1134, packages/ocamlodbc/trunk/debian/dirs)
===================================================================
--- packages/ocamlodbc/trunk/debian/dirs	2005-03-28 20:03:16 UTC (rev 1134)
+++ packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.dirs	2005-03-30 22:39:45 UTC (rev 1141)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/lintian/overrides

Deleted: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.files
===================================================================
--- packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.files	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.files	2005-03-30 22:39:45 UTC (rev 1141)
@@ -1 +0,0 @@
-usr/bin

Copied: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.install (from rev 1134, packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.files)
===================================================================
--- packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.files	2005-03-28 20:03:16 UTC (rev 1134)
+++ packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.install	2005-03-30 22:39:45 UTC (rev 1141)
@@ -0,0 +1 @@
+usr/bin/biniki

Added: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override
===================================================================

Added: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples
===================================================================
--- packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples	2005-03-30 22:39:45 UTC (rev 1141)
@@ -0,0 +1 @@
+Exemples/*.ml

Deleted: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.files
===================================================================
--- packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.files	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.files	2005-03-30 22:39:45 UTC (rev 1141)
@@ -1 +0,0 @@
-usr/lib/ocaml

Copied: packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.install (from rev 1134, packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.files)
===================================================================
--- packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.files	2005-03-28 20:03:16 UTC (rev 1134)
+++ packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.install	2005-03-30 22:39:45 UTC (rev 1141)
@@ -0,0 +1 @@
+usr/lib/ocaml/*

Added: packages/ocamlodbc/trunk/debian/patches/00list
===================================================================
--- packages/ocamlodbc/trunk/debian/patches/00list	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/patches/00list	2005-03-30 22:39:45 UTC (rev 1141)
@@ -0,0 +1 @@
+makefiles

Modified: packages/ocamlodbc/trunk/debian/rules
===================================================================
--- packages/ocamlodbc/trunk/debian/rules	2005-03-30 21:15:11 UTC (rev 1140)
+++ packages/ocamlodbc/trunk/debian/rules	2005-03-30 22:39:45 UTC (rev 1141)
@@ -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)
@@ -24,26 +26,15 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
 	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.
+	$(MAKE) depend
 	$(MAKE) unixodbc
 	cd Biniki && make en
 	cd Biniki && make unixodbc
@@ -52,12 +43,11 @@
 
 	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) clean_all
 	-cd Biniki && $(MAKE) clean_all
 	-rm -f Biniki/biniki_messages.ml config.{log,status} master.Makefile
@@ -69,9 +59,8 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+	dh_clean
 
-	dh_clean 
-
 install: build
 	dh_testdir
 	dh_testroot
@@ -79,17 +68,20 @@
 	dh_installdirs
 
 	mkdir -p debian/tmp`ocamlc -where`
-	# Add here commands to install the package into debian/tmp
 	$(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
-	if [ -f Biniki/biniki.opt ]; then cp Biniki/biniki.opt \
-		debian/tmp/usr/bin/biniki; else \
-		cp Biniki/biniki debian/tmp/usr/bin; fi
+	if [ -f Biniki/biniki.opt ]; then \
+		cp Biniki/biniki.opt \
+		debian/tmp/usr/bin/biniki; \
+	else \
+		cp Biniki/biniki debian/tmp/usr/bin; \
+	fi
+	cp debian/libocamlodbc-ocaml-bin.override \
+		debian/libocamlodbc-ocaml-bin/usr/share/lintian/overrides/libocamlodbc-ocaml-bin
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -98,28 +90,16 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_movefiles
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installexamples Exemples/*.ml
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installman
 	dh_link
 	dh_strip -X biniki
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
+	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol