The following commit has been merged in the master branch:
commit 23fd16ecc6b723bd0b7e741e7c52dcc3d15d4d95
Author: Mehdi Dogguy <me...@debian.org>
Date:   Wed Jan 4 17:47:46 2012 +0100

    Various changes

diff --git a/debian/control b/debian/control
index 69e08b2..2c19403 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,10 @@ Uploaders:
  Mehdi Dogguy <me...@debian.org>
 Build-Depends:
  cdbs (>= 0.4.23-1.1),
- dpatch,
  ocaml-nox (>= 3.11),
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  dh-ocaml (>= 0.9)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xml-light.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xml-light.git
 Homepage: http://tech.motion-twin.com/xmllight.html
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ddfab54..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_installopt
-02_cmi_depends
-03_cflags
-04_dtd_trace
-05_cmxs_plugin
diff --git a/debian/patches/01_installopt.dpatch 
b/debian/patches/01_installopt.diff
similarity index 74%
rename from debian/patches/01_installopt.dpatch
rename to debian/patches/01_installopt.diff
index 1dfb50c..9eeba42 100755
--- a/debian/patches/01_installopt.dpatch
+++ b/debian/patches/01_installopt.diff
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_installopt.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
 diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
 --- xml-light-2.2~/Makefile    2005-10-11 23:26:41.000000000 +0200
 +++ xml-light-2.2/Makefile     2005-10-11 23:28:00.000000000 +0200
diff --git a/debian/patches/02_cmi_depends.diff 
b/debian/patches/02_cmi_depends.diff
new file mode 100755
index 0000000..7e40f2a
--- /dev/null
+++ b/debian/patches/02_cmi_depends.diff
@@ -0,0 +1,11 @@
+diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
+--- xml-light-2.2~/Makefile    2006-01-03 17:34:23.000000000 +0100
++++ xml-light-2.2/Makefile     2006-01-03 17:35:04.000000000 +0100
+@@ -82,6 +82,6 @@
+ .mll.ml:
+       ocamllex $<
+ 
+-.mly.ml:
++%.mli %.ml: %.mly
+       ocamlyacc $<
+ 
diff --git a/debian/patches/02_cmi_depends.dpatch 
b/debian/patches/02_cmi_depends.dpatch
deleted file mode 100755
index 1fcf170..0000000
--- a/debian/patches/02_cmi_depends.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_cmi_depends.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile    2006-01-03 17:34:23.000000000 +0100
-+++ xml-light-2.2/Makefile     2006-01-03 17:35:04.000000000 +0100
-@@ -82,6 +82,6 @@
- .mll.ml:
-       ocamllex $<
- 
--.mly.ml:
-+%.mli %.ml: %.mly
-       ocamlyacc $<
- 
diff --git a/debian/patches/03_cflags.dpatch b/debian/patches/03_cflags.diff
similarity index 85%
rename from debian/patches/03_cflags.dpatch
rename to debian/patches/03_cflags.diff
index 5dfbffe..fd58404 100755
--- a/debian/patches/03_cflags.dpatch
+++ b/debian/patches/03_cflags.diff
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cflags.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
 diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
 --- xml-light-2.2~/Makefile    2006-10-26 00:22:41.000000000 +0200
 +++ xml-light-2.2/Makefile     2006-10-26 00:24:45.000000000 +0200
diff --git a/debian/patches/04_dtd_trace.dpatch 
b/debian/patches/04_dtd_trace.diff
similarity index 71%
rename from debian/patches/04_dtd_trace.dpatch
rename to debian/patches/04_dtd_trace.diff
index 9dbea4b..ac72387 100755
--- a/debian/patches/04_dtd_trace.dpatch
+++ b/debian/patches/04_dtd_trace.diff
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_dtd_trace.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
 diff -urNad xml-light-2.2~/dtd.ml xml-light-2.2/dtd.ml
 --- xml-light-2.2~/dtd.ml      2005-02-18 10:01:54.000000000 +0100
 +++ xml-light-2.2/dtd.ml       2006-10-26 23:22:25.000000000 +0200
diff --git a/debian/patches/05_cmxs_plugin.dpatch 
b/debian/patches/05_cmxs_plugin.diff
similarity index 62%
rename from debian/patches/05_cmxs_plugin.dpatch
rename to debian/patches/05_cmxs_plugin.diff
index 600bbd4..0f41270 100644
--- a/debian/patches/05_cmxs_plugin.dpatch
+++ b/debian/patches/05_cmxs_plugin.diff
@@ -1,36 +1,28 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_cmxs_plugin.dpatch by  <be...@touseg.insa-rennes.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
xml-light~/Makefile xml-light/Makefile
---- xml-light~/Makefile        2011-11-01 16:05:08.000000000 +0100
-+++ xml-light/Makefile 2011-11-01 16:06:34.905241750 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -9,13 +9,13 @@
- 
- all: xml-light.cma test.exe doc
- 
--opt: xml-light.cmxa test_opt.exe
-+opt: xml-light.cmxs test_opt.exe
- 
- install: all 
-       cp xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi 
dtd.cmi  $(INSTALLDIR)
- 
- installopt: opt all 
--      cp xml-light.a xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx 
$(INSTALLDIR)
-+      cp xml-light.a xml-light.cmxa xml-light.cmxs xml.cmx dtd.cmx 
xmlParser.cmx $(INSTALLDIR)
- 
- doc:
-       mkdir doc
+ 
+ all: xml-light.cma test.exe doc
+ 
+-opt: xml-light.cmxa test_opt.exe
++opt: xml-light.cmxs test_opt.exe
+ 
+ install: all 
+       cp xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi 
dtd.cmi  $(INSTALLDIR)
+ 
+ installopt: opt all 
+-      cp xml-light.a xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx 
$(INSTALLDIR)
++      cp xml-light.a xml-light.cmxa xml-light.cmxs xml.cmx dtd.cmx 
xmlParser.cmx $(INSTALLDIR)
+ 
+ doc:
+       mkdir doc
 @@ -33,6 +33,9 @@
- xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx 
-       ocamlopt -o xml-light.cmxa $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) 
xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
- 
-+xml-light.cmxs: xml-light.cmxa
-+      ocamlopt -o xml-light.cmxs -shared -linkall xml-light.cmxa
-+
- dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
- 
- dtd.cmx: xml.cmi xml_lexer.cmi dtd.cmi
+ xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx 
+       ocamlopt -o xml-light.cmxa $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) 
xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
+ 
++xml-light.cmxs: xml-light.cmxa
++      ocamlopt -o xml-light.cmxs -shared -linkall xml-light.cmxa
++
+ dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
+ 
+ dtd.cmx: xml.cmi xml_lexer.cmi dtd.cmi
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..68f6b97
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_installopt.diff
+02_cmi_depends.diff
+03_cflags.diff
+04_dtd_trace.diff
+05_cmxs_plugin.diff
diff --git a/debian/rules b/debian/rules
index f45ee6d..eed85db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,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)

-- 
xml-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

Reply via email to