[Pkg-ocaml-maint-commits] r3477 - in /trunk/packages/ocaml-xml-rpc/trunk/debian: changelog compat control copyright doc-base patches/00dpatch.conf patches/annexlib.dpatch patches/ocaml-xml-rpc.dpatch rules

munga-guest at users.alioth.debian.org munga-guest at users.alioth.debian.org
Thu Jan 4 12:52:20 CET 2007 

Author: munga-guest
Date: Thu Jan  4 12:52:19 2007
New Revision: 3477

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3477
Log:
added dpatchconf and minor fixes

Added:
    trunk/packages/ocaml-xml-rpc/trunk/debian/patches/00dpatch.conf
Modified:
    trunk/packages/ocaml-xml-rpc/trunk/debian/changelog
    trunk/packages/ocaml-xml-rpc/trunk/debian/compat
    trunk/packages/ocaml-xml-rpc/trunk/debian/control
    trunk/packages/ocaml-xml-rpc/trunk/debian/copyright
    trunk/packages/ocaml-xml-rpc/trunk/debian/doc-base
    trunk/packages/ocaml-xml-rpc/trunk/debian/patches/annexlib.dpatch
    trunk/packages/ocaml-xml-rpc/trunk/debian/patches/ocaml-xml-rpc.dpatch
    trunk/packages/ocaml-xml-rpc/trunk/debian/rules

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/changelog?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/changelog Thu Jan  4 12:52:19 2007
@@ -1,6 +1,6 @@
 ocaml-xml-rpc (0.2.3-1) unstable; urgency=low
 
-  [ Pietro abate  ]
+  [ Pietro Abate ]
   * Initial release (Closes #395122).
 
- --  <Pietro.Abate at anu.edu.au>  Wed, 25 Oct 2006 10:15:40 +1000
+ -- Pietro Abate <pietro.abate at anu.edu.au>  Thu,  4 Jan 2007 22:44:31 +1100

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/compat?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/compat (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/compat Thu Jan  4 12:52:19 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/control?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/control (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/control Thu Jan  4 12:52:19 2007
@@ -2,16 +2,16 @@
 Section: devel
 Priority: optional
 Maintainer: Pietro Abate <pietro.abate at anu.edu.au>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12), cdbs
+Build-Depends: debhelper (>> 5.0.0), ocaml-nox (>= 3.09.2-7), ocaml-findlib (>= 1.1), libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12), libpxp-ocaml-dev(>= 1.1.96), libextlib-ocaml-dev (>= 1.5), libnetclient-ocaml-dev (>= 0.91), cdbs, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc
 
 Package: libxmlrpc-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12)
+Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev (>= 5.11.1), libocamlnet-ocaml-dev (>= 1.1-12), libpxp-ocaml-dev(>= 1.1.96), libextlib-ocaml-dev (>= 1.5), libnetclient-ocaml-dev (>= 0.91)
 Description: XML-RPC support library for ocaml
  Ocaml XML-RPC is a library for the Objective Caml programming language
  that implements the XML-RPC specification. XML-RPC remote procedure 
  calling mechanism that uses HTTP as the transport and XML as the encoding.
  .
- Homepage: http://raevnos.pennmush.org/code/ocaml-xml-rpc/
+  Homepage: http://raevnos.pennmush.org/code/ocaml-xml-rpc/

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/copyright?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/copyright (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/copyright Thu Jan  4 12:52:19 2007
@@ -1,10 +1,29 @@
+This package was debianized by Pietro Abate <pietro.abate at anu.edu.au> on
+Thu,  29 Oct 2006
 
-Author: Shawn Wagner <shawnw at speakeasy.org>
+It was downloaded from:
+  http://raevnos.pennmush.org/code/ocaml-xml-rpc/
+
+Upstream Author:
+  Shawn Wagner <shawnw at speakeasy.org>
 
 Copyright:
-  OCaml XML-RPC is distributed under the term of the GNU Library General
-  Public License version 2, on Debian systems you can find a copy of the
-  license in:
 
-    /usr/share/common-licenses/LGPL-2
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
 
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+  USA.
+
+  On a Debian GNU/Linux system, the LGPL can be found as
+  /usr/share/common-licenses/LGPL-2.1.
+

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/doc-base
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/doc-base?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/doc-base (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/doc-base Thu Jan  4 12:52:19 2007
@@ -6,4 +6,4 @@
 
 Format: HTML
 Index: /usr/share/doc/libxmlrpc-ocaml-dev/html/index.html
-Files: /usr/share/doc/libhxmlrpc-ocaml-dev/html/*
+Files: /usr/share/doc/libxmlrpc-ocaml-dev/html/*

Added: trunk/packages/ocaml-xml-rpc/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/patches/00dpatch.conf?rev=3477&op=file
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/patches/00dpatch.conf (added)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/patches/00dpatch.conf Thu Jan  4 12:52:19 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../upstream

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/patches/annexlib.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/patches/annexlib.dpatch?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/patches/annexlib.dpatch (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/patches/annexlib.dpatch Thu Jan  4 12:52:19 2007
@@ -3,6 +3,8 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: remove annexlib dep
+## This patch remove a the dependency from a small extenal library, annexlib,
+## that does not exists in debian
 
 @DPATCH@
 

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/patches/ocaml-xml-rpc.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/patches/ocaml-xml-rpc.dpatch?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/patches/ocaml-xml-rpc.dpatch (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/patches/ocaml-xml-rpc.dpatch Thu Jan  4 12:52:19 2007
@@ -5,9 +5,18 @@
 ## DP: makefile
 
 @DPATCH@
+diff -urNad trunk~/META trunk/META
+--- trunk~/META	2004-03-28 16:50:07.000000000 +1000
++++ trunk/META	2007-01-04 22:53:51.227057500 +1100
+@@ -1,4 +1,4 @@
+-version = "0.2.2"
++version = "0.2.3"
+ requires = "netstring,netclient,pxp,pcre,extlib"
+ description = "XML-RPC client and server"
+ archive(byte) = "xmlrpc.cma"
 diff -urNad trunk~/Makefile trunk/Makefile
 --- trunk~/Makefile	2004-05-13 03:14:48.000000000 +1000
-+++ trunk/Makefile	2006-10-28 19:55:46.771255250 +1000
++++ trunk/Makefile	2007-01-04 22:53:29.781717250 +1100
 @@ -1,9 +1,10 @@
  MLI_SOURCES=xmlRPCTypes.mli xmlRPCDtd.mli xmlRPCNet.mli xmlRPCClient.mli xmlRPCServer.mli cgiSource.mli
  ML_SOURCES=xmlRPCTypes.ml xmlRPCDtd.ml xmlRPCNet.ml xmlRPCClient.ml xmlRPCServer.ml cgiSource.ml
@@ -48,14 +57,14 @@
 +	if [ -f oxridl.opt ]; then IDLC="oxridl.opt"; else IDLC="oxridl"; fi ;\
 +	mkdir -p $(prefix)$(BIN_DIR)
 +	cp $(IDLC) $(prefix)$(BIN_DIR)/oxridl
-+	mkdir -p $(prefix)/usr/share/doc/libhxmlrpc-ocaml-dev/html
-+	cp -a doc/html/* $(prefix)/usr/share/doc/libhxmlrpc-ocaml-dev/html/
++	mkdir -p $(prefix)/usr/share/doc/libxmlrpc-ocaml-dev/html
++	cp -a doc/html/* $(prefix)/usr/share/doc/libxmlrpc-ocaml-dev/html/
  
  uninstall:
  	ocamlfind remove $(NAME)
 diff -urNad trunk~/debian/patched/ocaml-xml-rpc.dpatch.failed trunk/debian/patched/ocaml-xml-rpc.dpatch.failed
 --- trunk~/debian/patched/ocaml-xml-rpc.dpatch.failed	1970-01-01 10:00:00.000000000 +1000
-+++ trunk/debian/patched/ocaml-xml-rpc.dpatch.failed	2006-10-28 19:55:14.021208500 +1000
++++ trunk/debian/patched/ocaml-xml-rpc.dpatch.failed	2007-01-04 22:53:29.781717250 +1100
 @@ -0,0 +1,6 @@
 +patching file Makefile
 +Hunk #1 FAILED at 1.

Modified: trunk/packages/ocaml-xml-rpc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-xml-rpc/trunk/debian/rules?rev=3477&op=diff
==============================================================================
--- trunk/packages/ocaml-xml-rpc/trunk/debian/rules (original)
+++ trunk/packages/ocaml-xml-rpc/trunk/debian/rules Thu Jan  4 12:52:19 2007
@@ -2,23 +2,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-#include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
 PKGNAME=libxmlrpc-ocaml-dev
 
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
-
-DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/$(PKGNAME) DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
+DEB_MAKE_BUILD_TARGET = all
+DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/$(PKGNAME) DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 
 ifeq ($(HAVE_OCAMLOPT),yes)
-build/$(PKGNAME)::
-	$(MAKE) opt
+DEB_MAKE_BUILD_TARGET += opt
 endif

More information about the Pkg-ocaml-maint-commits mailing list