The following commit has been merged in the master branch: commit bef8667694cab46d8508c6cdaa17f369748e0dc3 Author: Stephane Glondu <st...@glondu.net> Date: Fri Jul 22 00:36:08 2011 +0200
Switch source package format to 3.0 (quilt) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index babfb6c..0000000 --- a/debian/README.source +++ /dev/null @@ -1,5 +0,0 @@ -This package uses dpatch for patching the source. - -Please consider reading dpatch manpage to patch the source. - - -- Mehdi Dogguy <me...@debian.org>, Sun, 1 Nov 2009 13:16:01 +0100 diff --git a/debian/control b/debian/control index c6dd089..4aaa890 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Build-Depends: cdbs, debhelper (>= 7), - dpatch, ocaml-nox, libocamlnet-ocaml-dev, libxml-light-ocaml-dev, diff --git a/debian/patches/install.dpatch b/debian/patches/0001-Allow-installation-under-a-given-div-externally-pass.patch old mode 100755 new mode 100644 similarity index 65% rename from debian/patches/install.dpatch rename to debian/patches/0001-Allow-installation-under-a-given-div-externally-pass.patch index 7d38cdb..f9aea24 --- a/debian/patches/install.dpatch +++ b/debian/patches/0001-Allow-installation-under-a-given-div-externally-pass.patch @@ -1,14 +1,17 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_install.dpatch by Pietro Abate <pietro.ab...@anu.edu.au> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: allow installation under a given div, externally passed by debian/rules +From: Pietro Abate <pietro.ab...@anu.edu.au> +Date: Fri, 22 Jul 2011 00:34:28 +0200 +Subject: Allow installation under a given div, externally passed by + debian/rules -@DPATCH@ -diff -urNad trunk~/Makefile trunk/Makefile ---- trunk~/Makefile 2007-11-25 21:23:19.000000000 +0100 -+++ trunk/Makefile 2008-01-10 14:11:48.000000000 +0100 -@@ -5,10 +5,13 @@ +--- + Makefile | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e9f50e6..e7dee0b 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,10 +5,13 @@ SOURCES = XmlRpcBase64.mli XmlRpcBase64.ml XmlRpcDateTime.mli XmlRpcDateTime.ml PACKS = xml-light,netclient,nethttpd-for-netcgi2 LIBINSTALL_FILES = XmlRpcBase64.mli XmlRpcBase64.cmi XmlRpcDateTime.mli XmlRpcDateTime.cmi XmlRpc.mli XmlRpc.cmi XmlRpcServer.mli XmlRpcServer.cmi xmlrpc-light.cma xmlrpc-light.cmxa xmlrpc-light.a OCAMLDOC = ocamlfind ocamldoc -package xml-light,nethttpd-for-netcgi2 @@ -24,3 +27,4 @@ diff -urNad trunk~/Makefile trunk/Makefile uninstall: libuninstall .PHONY: test +-- diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf deleted file mode 100644 index 685acc6..0000000 --- a/debian/patches/00dpatch.conf +++ /dev/null @@ -1,2 +0,0 @@ -conf_debianonly=1 -conf_origtargzpath=../tarballs diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 003a2db..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -install.dpatch diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2dba2ad --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Allow-installation-under-a-given-div-externally-pass.patch diff --git a/debian/rules b/debian/rules index 8f00070..ebb82bc 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, # MA 02110-1301, USA. -include /usr/share/cdbs/1/rules/dpatch.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/ocaml.mk diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- xmlrpc-light packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits