[Pkg-ocaml-maint-commits] r2299 - trunk/packages/pycaml/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2005-12-19 20:01:10 +0000 (Mon, 19 Dec 2005)
New Revision: 2299

Added:
   trunk/packages/pycaml/trunk/debian/override.in
Removed:
   trunk/packages/pycaml/trunk/debian/override
Modified:
   trunk/packages/pycaml/trunk/debian/changelog
   trunk/packages/pycaml/trunk/debian/control
   trunk/packages/pycaml/trunk/debian/copyright
   trunk/packages/pycaml/trunk/debian/rules
   trunk/packages/pycaml/trunk/debian/watch
Log:
Updated to OCaml 3.09.0.

Modified: trunk/packages/pycaml/trunk/debian/changelog
===================================================================
--- trunk/packages/pycaml/trunk/debian/changelog	2005-12-19 19:45:01 UTC (rev 2298)
+++ trunk/packages/pycaml/trunk/debian/changelog	2005-12-19 20:01:10 UTC (rev 2299)
@@ -1,3 +1,12 @@
+pycaml (0.82-2) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI in debian/* files.
+  * Updated FSF's address in copyright.
+  * Updated watch file.
+
+ -- Samuel Mimram <smimram at debian.org>  Mon, 19 Dec 2005 20:55:21 +0100
+
 pycaml (0.82-1) unstable; urgency=low
 
   * New maintainer, closes: #305455.

Modified: trunk/packages/pycaml/trunk/debian/control
===================================================================
--- trunk/packages/pycaml/trunk/debian/control	2005-12-19 19:45:01 UTC (rev 2298)
+++ trunk/packages/pycaml/trunk/debian/control	2005-12-19 20:01:10 UTC (rev 2299)
@@ -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), ocaml-nox-3.08.3, python-dev (>= 2.3), ocaml-tools
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), python-dev (>= 2.3), ocaml-tools
 Standards-Version: 3.6.2
 
 Package: pycaml
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
-Recommends: ocaml-nox-3.08.3
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Recommends: ocaml-nox-${F:OCamlABI}
 Description: OCaml bindings to embed Python interpreter and objects
  Pycaml is intended to allow users to build native OCaml libraries and
  use them from Python, and conversely, in order to allow OCaml users

Modified: trunk/packages/pycaml/trunk/debian/copyright
===================================================================
--- trunk/packages/pycaml/trunk/debian/copyright	2005-12-19 19:45:01 UTC (rev 2298)
+++ trunk/packages/pycaml/trunk/debian/copyright	2005-12-19 20:01:10 UTC (rev 2299)
@@ -19,7 +19,7 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this package; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 On Debian systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL'.

Deleted: trunk/packages/pycaml/trunk/debian/override
===================================================================
--- trunk/packages/pycaml/trunk/debian/override	2005-12-19 19:45:01 UTC (rev 2298)
+++ trunk/packages/pycaml/trunk/debian/override	2005-12-19 20:01:10 UTC (rev 2299)
@@ -1 +0,0 @@
-binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08.3/dllpycaml_stubs.so /usr/lib/python2.3/config

Copied: trunk/packages/pycaml/trunk/debian/override.in (from rev 1485, trunk/packages/pycaml/trunk/debian/override)
===================================================================
--- trunk/packages/pycaml/trunk/debian/override	2005-07-28 15:49:41 UTC (rev 1485)
+++ trunk/packages/pycaml/trunk/debian/override.in	2005-12-19 20:01:10 UTC (rev 2299)
@@ -0,0 +1 @@
+binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/dllpycaml_stubs.so /usr/lib/python2.3/config

Modified: trunk/packages/pycaml/trunk/debian/rules
===================================================================
--- trunk/packages/pycaml/trunk/debian/rules	2005-12-19 19:45:01 UTC (rev 2298)
+++ trunk/packages/pycaml/trunk/debian/rules	2005-12-19 20:01:10 UTC (rev 2299)
@@ -11,6 +11,9 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
 DESTDIR = $(CURDIR)/debian/pycaml/$(shell ocamlc -where)
 
 CFLAGS = -Wall -g
@@ -24,12 +27,15 @@
 	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
 
-build: build-stamp
+build: ocamlinit build-stamp
 build-stamp: config.status
 	dh_testdir
 
@@ -95,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 ocamlinit

Modified: trunk/packages/pycaml/trunk/debian/watch
===================================================================
--- trunk/packages/pycaml/trunk/debian/watch	2005-12-19 19:45:01 UTC (rev 2298)
+++ trunk/packages/pycaml/trunk/debian/watch	2005-12-19 20:01:10 UTC (rev 2299)
@@ -1,3 +1,3 @@
-version=2
+version=3
 
-http://heanet.dl.sourceforge.net/sourceforge/pycaml/pycaml-([0-9\.]*)\.tar\.gz debian uupdate
+http://sf.net/pycaml/pycaml-([0-9\.]*)\.tar\.gz debian uupdate