[Pkg-ocaml-maint-commits] r6316 - in /trunk/packages/json-wheel/trunk/debian: changelog control control.in libjson-wheel-ocaml-dev.install.in rules

[toots at users.alioth.debian.org]

Author: toots
Date: Sat Mar  7 18:37:13 2009
New Revision: 6316

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

Modified:
    trunk/packages/json-wheel/trunk/debian/changelog
    trunk/packages/json-wheel/trunk/debian/control
    trunk/packages/json-wheel/trunk/debian/control.in
    trunk/packages/json-wheel/trunk/debian/libjson-wheel-ocaml-dev.install.in
    trunk/packages/json-wheel/trunk/debian/rules

Modified: trunk/packages/json-wheel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/debian/changelog?rev=6316&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/changelog (original)
+++ trunk/packages/json-wheel/trunk/debian/changelog Sat Mar  7 18:37:13 2009
@@ -1,3 +1,11 @@
+json-wheel (1.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added build-dep on dh_ocaml.
+  * Updated install files to use new ocaml related variables. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 07 Mar 2009 19:26:58 +0100
+
 json-wheel (1.0.4-4) unstable; urgency=low
 
   * Fixed wrong dh_install call 

Modified: trunk/packages/json-wheel/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/debian/control?rev=6316&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/control (original)
+++ trunk/packages/json-wheel/trunk/debian/control Sat Mar  7 18:37:13 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org> 
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), ocaml-nox, ocaml-findlib, libocamlnet-ocaml-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), ocaml-nox, ocaml-findlib, libocamlnet-ocaml-dev, dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://martin.jambon.free.fr/json-wheel.html
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/
@@ -11,7 +11,9 @@
 Package: libjson-wheel-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libocamlnet-ocaml-dev, ${shlibs:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, 
+         libocamlnet-ocaml-dev, ${shlibs:Depends},
+         ${misc:Depends}
 Description: OCaml API to JSON data format
  json-wheel provides an API to generate and read JSON
  data from an OCaml program. It maps each types of data

Modified: trunk/packages/json-wheel/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/debian/control.in?rev=6316&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/control.in (original)
+++ trunk/packages/json-wheel/trunk/debian/control.in Sat Mar  7 18:37:13 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org> 
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: @cdbs@, ocaml-findlib, libocamlnet-ocaml-dev
+Build-Depends: @cdbs@, ocaml-findlib, libocamlnet-ocaml-dev, dh-ocaml
 Standards-Version: 3.8.0
 Homepage: http://martin.jambon.free.fr/json-wheel.html
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/
@@ -11,7 +11,9 @@
 Package: libjson-wheel-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libocamlnet-ocaml-dev, ${shlibs:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, 
+         libocamlnet-ocaml-dev, ${shlibs:Depends},
+         ${misc:Depends}
 Description: OCaml API to JSON data format
  json-wheel provides an API to generate and read JSON
  data from an OCaml program. It maps each types of data

Modified: trunk/packages/json-wheel/trunk/debian/libjson-wheel-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/debian/libjson-wheel-ocaml-dev.install.in?rev=6316&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/libjson-wheel-ocaml-dev.install.in (original)
+++ trunk/packages/json-wheel/trunk/debian/libjson-wheel-ocaml-dev.install.in Sat Mar  7 18:37:13 2009
@@ -1,3 +1,5 @@
-usr/lib/ocaml/@OCamlABI@/json-wheel/META
-usr/lib/ocaml/@OCamlABI@/json-wheel/*.cm*
-usr/lib/ocaml/@OCamlABI@/json-wheel/*.ml*
+ at OCamlStdlibDir@/json-wheel/META
+ at OCamlStdlibDir@/json-wheel/*.cm*
+ at OCamlStdlibDir@/json-wheel/*.ml*
+OPT: @OCamlStdlibDir@/json-wheel/*.a
+OPT: usr/bin/jsoncat

Modified: trunk/packages/json-wheel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/json-wheel/trunk/debian/rules?rev=6316&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/rules (original)
+++ trunk/packages/json-wheel/trunk/debian/rules Sat Mar  7 18:37:13 2009
@@ -29,8 +29,3 @@
 	mkdir -p $(PREFIX)/bin
 	make html
 
-install/libjson-wheel-ocaml-dev::
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	dh_install --sourcedir=debian/tmp  usr/bin/jsoncat 
-	dh_install --sourcedir=debian/tmp  usr/lib/ocaml/$(OCAML_ABI)/json-wheel/*.a
-endif