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

[toots at users.alioth.debian.org]

Author: toots
Date: Sun Aug 10 08:37:45 2008
New Revision: 5922

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5922
Log:
Fixed build on non native archs

Removed:
    trunk/packages/json-wheel/trunk/debian/manpages
Modified:
    trunk/packages/json-wheel/trunk/debian/   (props changed)
    trunk/packages/json-wheel/trunk/debian/changelog
    trunk/packages/json-wheel/trunk/debian/libjson-wheel-ocaml-dev.install.in
    trunk/packages/json-wheel/trunk/debian/rules

Propchange: trunk/packages/json-wheel/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

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=5922&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/changelog (original)
+++ trunk/packages/json-wheel/trunk/debian/changelog Sun Aug 10 08:37:45 2008
@@ -1,3 +1,9 @@
+json-wheel (1.0.4-2) unstable; urgency=low
+
+  * Fixed build on non native archs 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sun, 10 Aug 2008 10:34:31 +0200
+
 json-wheel (1.0.4-1) unstable; urgency=low
 
   * Initial release and upload to unstable

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=5922&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 Sun Aug 10 08:37:45 2008
@@ -2,4 +2,3 @@
 usr/lib/ocaml/@OCamlABI@/json-wheel/*.a
 usr/lib/ocaml/@OCamlABI@/json-wheel/*.cm*
 usr/lib/ocaml/@OCamlABI@/json-wheel/*.ml*
-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=5922&op=diff
==============================================================================
--- trunk/packages/json-wheel/trunk/debian/rules (original)
+++ trunk/packages/json-wheel/trunk/debian/rules Sun Aug 10 08:37:45 2008
@@ -14,10 +14,11 @@
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_INSTALL_ARGS :=  --list-missing
 DEB_INSTALL_CHANGELOGS := Changes
-DEB_MAKE_BUILD_TARGET := bcl jsoncat
+DEB_MAKE_BUILD_TARGET := bcl
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-        DEB_MAKE_BUILD_TARGET += ncl
+        DEB_MAKE_BUILD_TARGET += ncl jsoncat
+	DEB_INSTALL_MANPAGES_libjson-wheel-ocaml-dev = debian/jsoncat.1
 endif
 
 
@@ -28,3 +29,7 @@
 	mkdir -p $(PREFIX)/bin
 	make html
 
+install/libjson-wheel-ocaml-dev::
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	dh_install --sourcedir=debian/tmp  usr/bin/jsoncat
+endif