The following commit has been merged in the master branch:
commit 497288423c67387ee04ed3889c93403b710b13ac
Author: Mehdi Dogguy <me...@debian.org>
Date:   Thu Jan 5 13:12:38 2012 +0100

    Convert to 3.0 (quilt) source format

diff --git a/debian/changelog b/debian/changelog
index e4d8075..d4d3df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mlpcap (0.9-16) UNRELEASED; urgency=low
+
+  * Convert to 3.0 (quilt) source format
+    - Fix build-depends-on-obsolete-package dpatch
+    - Fix debian-rules-uses-deprecated-makefile dpatch.mk
+
+ -- Mehdi Dogguy <me...@debian.org>  Thu, 05 Jan 2012 13:11:29 +0100
+
 mlpcap (0.9-15) unstable; urgency=low
 
   * Use dh-ocaml 0.9.1 features 
diff --git a/debian/control b/debian/control
index 76d729e..ebe32fe 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers 
<debian-ocaml-ma...@lists.debian.org>
 Uploaders: Sylvain Le Gall <gil...@debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1), 
  debhelper (>= 7), 
- dpatch, 
  ocaml-nox (>= 3.10.0-9), 
  camlidl (>= 1.05-10), 
  libffcall1-dev, 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8506d57..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-04_shtool
-05_configure_in
-06_configure
-02_ocamlfind_for_example
-03_correct_META
-07_dll_with_camlidl
diff --git a/debian/patches/01_debian_configuration.diff 
b/debian/patches/01_debian_configuration.diff
new file mode 100755
index 0000000..462d0dd
--- /dev/null
+++ b/debian/patches/01_debian_configuration.diff
@@ -0,0 +1,21 @@
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: Use Debian's camlidl
+
+diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/config.h 
MLpcap-0.7/config.h
+--- /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/config.h 
2004-02-05 23:08:58.000000000 +0100
++++ MLpcap-0.7/config.h        2004-02-22 18:17:50.000000000 +0100
+@@ -1 +1 @@
+-#include "/home/x25/soft/ffcall-1.8/callback/callback.h"
++#include "/usr/include/callback.h"
+diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/Makefile 
MLpcap-0.7/Makefile
+--- /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/Makefile 
2004-02-06 22:32:35.000000000 +0100
++++ MLpcap-0.7/Makefile        2004-02-22 18:18:24.000000000 +0100
+@@ -11,7 +11,7 @@
+ all: $(OBJSC) $(OBJSML)
+ 
+ pcap_stubs.c:
+-      $(CAMLIDLHOME)/compiler/camlidl -no-include pcap.idl
++      camlidl -no-include pcap.idl
+ 
+ $(OBJSC): pcap_stubs.c
+       $(CC) $(CFLAGS) -I $(CAMLIDLHOME) -c pcap_stubs.c
diff --git a/debian/patches/01_debian_configuration.dpatch 
b/debian/patches/01_debian_configuration.dpatch
deleted file mode 100755
index d3f43ca..0000000
--- a/debian/patches/01_debian_configuration.dpatch
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## 01_debian_configuration.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/config.h 
MLpcap-0.7/config.h
---- /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/config.h 
2004-02-05 23:08:58.000000000 +0100
-+++ MLpcap-0.7/config.h        2004-02-22 18:17:50.000000000 +0100
-@@ -1 +1 @@
--#include "/home/x25/soft/ffcall-1.8/callback/callback.h"
-+#include "/usr/include/callback.h"
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/Makefile 
MLpcap-0.7/Makefile
---- /mnt/nfs0/gildor/deb/ocaml-package/TODO/mlpcap/MLpcap-0.7/Makefile 
2004-02-06 22:32:35.000000000 +0100
-+++ MLpcap-0.7/Makefile        2004-02-22 18:18:24.000000000 +0100
-@@ -11,7 +11,7 @@
- all: $(OBJSC) $(OBJSML)
- 
- pcap_stubs.c:
--      $(CAMLIDLHOME)/compiler/camlidl -no-include pcap.idl
-+      camlidl -no-include pcap.idl
- 
- $(OBJSC): pcap_stubs.c
-       $(CC) $(CFLAGS) -I $(CAMLIDLHOME) -c pcap_stubs.c
diff --git a/debian/patches/02_ocamlfind_for_example.diff 
b/debian/patches/02_ocamlfind_for_example.diff
new file mode 100755
index 0000000..a7cb9ce
--- /dev/null
+++ b/debian/patches/02_ocamlfind_for_example.diff
@@ -0,0 +1,27 @@
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: Use ocamlfind to compile the project
+
+diff -urNad mlpcap-0.9~/tests/Makefile.in mlpcap-0.9/tests/Makefile.in
+--- mlpcap-0.9~/tests/Makefile.in      2006-11-01 22:41:54.000000000 +0100
++++ mlpcap-0.9/tests/Makefile.in       2006-11-01 22:43:35.000000000 +0100
+@@ -1,4 +1,3 @@
+-OCAMLC=ocamlc
+ CAMLP4O=camlp4o
+ 
+ OBJECTS = misc.cmo pcap_next.cmo pcap_loop.cmo \
+@@ -12,7 +11,7 @@
+ all: $(TARGETS)
+ 
+ $(TARGETS): $(OBJECTS)
+-      $(OCAMLC) -g -o $@ $@.cmo -I .. pcap.cma 
++      ocamlfind ocamlc -package pcap -linkpkg -o $@ $@.cmo
+ 
+ clean:
+       rm -f *.cmo *.cmi $(TARGETS)
+@@ -20,5 +19,5 @@
+ .SUFFIXES: .ml .cmo .cmi
+ 
+ .ml.cmo: 
+-      $(OCAMLC) -pp '$(CAMLP4O) pa_macro.cmo @cp4flag@' -I .. -c $<
++      ocamlfind ocamlc -package pcap -pp '$(CAMLP4O) pa_macro.cmo @cp4flag@' 
-c $<
+ 
diff --git a/debian/patches/02_ocamlfind_for_example.dpatch 
b/debian/patches/02_ocamlfind_for_example.dpatch
deleted file mode 100755
index 42ab04a..0000000
--- a/debian/patches/02_ocamlfind_for_example.dpatch
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-## 02_ocamlfind_for_example.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad mlpcap-0.9~/tests/Makefile.in mlpcap-0.9/tests/Makefile.in
---- mlpcap-0.9~/tests/Makefile.in      2006-11-01 22:41:54.000000000 +0100
-+++ mlpcap-0.9/tests/Makefile.in       2006-11-01 22:43:35.000000000 +0100
-@@ -1,4 +1,3 @@
--OCAMLC=ocamlc
- CAMLP4O=camlp4o
- 
- OBJECTS = misc.cmo pcap_next.cmo pcap_loop.cmo \
-@@ -12,7 +11,7 @@
- all: $(TARGETS)
- 
- $(TARGETS): $(OBJECTS)
--      $(OCAMLC) -g -o $@ $@.cmo -I .. pcap.cma 
-+      ocamlfind ocamlc -package pcap -linkpkg -o $@ $@.cmo
- 
- clean:
-       rm -f *.cmo *.cmi $(TARGETS)
-@@ -20,5 +19,5 @@
- .SUFFIXES: .ml .cmo .cmi
- 
- .ml.cmo: 
--      $(OCAMLC) -pp '$(CAMLP4O) pa_macro.cmo @cp4flag@' -I .. -c $<
-+      ocamlfind ocamlc -package pcap -pp '$(CAMLP4O) pa_macro.cmo @cp4flag@' 
-c $<
- 
diff --git a/debian/patches/03_correct_META.diff 
b/debian/patches/03_correct_META.diff
new file mode 100755
index 0000000..d9f0986
--- /dev/null
+++ b/debian/patches/03_correct_META.diff
@@ -0,0 +1,15 @@
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: Fix META file
+
+diff -urNad mlpcap-0.9~/META mlpcap-0.9/META
+--- mlpcap-0.9~/META   2004-05-21 23:57:58.000000000 +0200
++++ mlpcap-0.9/META    2006-11-01 22:46:00.000000000 +0100
+@@ -1,7 +1,6 @@
+ name="pcap"
+-version="0.8"
++version="0.9"
+ description="Ocaml bindings to libpcap"
+ requires=""
+ archive(byte) = "pcap.cma"
+ archive(opt) = "pcap.cmxa"
+-linkopts = "-cclib -lpcap -cclib -lcallback"
diff --git a/debian/patches/03_correct_META.dpatch 
b/debian/patches/03_correct_META.dpatch
deleted file mode 100755
index bf06671..0000000
--- a/debian/patches/03_correct_META.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 03_correct_META.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad mlpcap-0.9~/META mlpcap-0.9/META
---- mlpcap-0.9~/META   2004-05-21 23:57:58.000000000 +0200
-+++ mlpcap-0.9/META    2006-11-01 22:46:00.000000000 +0100
-@@ -1,7 +1,6 @@
- name="pcap"
--version="0.8"
-+version="0.9"
- description="Ocaml bindings to libpcap"
- requires=""
- archive(byte) = "pcap.cma"
- archive(opt) = "pcap.cmxa"
--linkopts = "-cclib -lpcap -cclib -lcallback"
diff --git a/debian/patches/04_shtool.dpatch b/debian/patches/04_shtool.diff
similarity index 99%
rename from debian/patches/04_shtool.dpatch
rename to debian/patches/04_shtool.diff
index 8800a02..d045d55 100755
--- a/debian/patches/04_shtool.dpatch
+++ b/debian/patches/04_shtool.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_shtool.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: shtool
 
-@DPATCH@
 diff -urNad mlpcap-0.9~/etc/shtool mlpcap-0.9/etc/shtool
 --- mlpcap-0.9~/etc/shtool     2004-05-21 23:57:58.000000000 +0200
 +++ mlpcap-0.9/etc/shtool      2006-07-12 01:10:40.000000000 +0200
diff --git a/debian/patches/05_configure_in.dpatch 
b/debian/patches/05_configure_in.diff
similarity index 97%
rename from debian/patches/05_configure_in.dpatch
rename to debian/patches/05_configure_in.diff
index 62b620d..85d1999 100755
--- a/debian/patches/05_configure_in.dpatch
+++ b/debian/patches/05_configure_in.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_configure_in.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: configure_in
 
-@DPATCH@
 diff -urNad mlpcap-0.9~/Makefile.in mlpcap-0.9/Makefile.in
 --- mlpcap-0.9~/Makefile.in    2006-11-01 22:39:42.000000000 +0100
 +++ mlpcap-0.9/Makefile.in     2006-11-01 22:41:09.000000000 +0100
diff --git a/debian/patches/06_configure.dpatch 
b/debian/patches/06_configure.diff
similarity index 99%
rename from debian/patches/06_configure.dpatch
rename to debian/patches/06_configure.diff
index db0f6f6..afc3f40 100755
--- a/debian/patches/06_configure.dpatch
+++ b/debian/patches/06_configure.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_configure.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: configure
 
-@DPATCH@
 diff -urNad mlpcap-0.9.orig~/configure mlpcap-0.9.orig/configure
 --- mlpcap-0.9.orig~/configure 2006-11-01 22:17:13.000000000 +0100
 +++ mlpcap-0.9.orig/configure  2006-11-01 22:19:08.000000000 +0100
diff --git a/debian/patches/07_dll_with_camlidl.dpatch 
b/debian/patches/07_dll_with_camlidl.diff
similarity index 69%
rename from debian/patches/07_dll_with_camlidl.dpatch
rename to debian/patches/07_dll_with_camlidl.diff
index 467543d..8ecebc6 100755
--- a/debian/patches/07_dll_with_camlidl.dpatch
+++ b/debian/patches/07_dll_with_camlidl.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_dll_with_camlidl.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Author: Sylvain Le Gall <gil...@debian.org>
+Description: Use system's libcamlidl.a
 
-@DPATCH@
 diff -urNad mlpcap-0.9~/OCamlMakefile mlpcap-0.9/OCamlMakefile
 --- mlpcap-0.9~/OCamlMakefile  2004-05-21 23:57:58.000000000 +0200
 +++ mlpcap-0.9/OCamlMakefile   2008-07-28 23:33:57.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..802ff9c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+04_shtool.diff
+05_configure_in.diff
+06_configure.diff
+02_ocamlfind_for_example.diff
+03_correct_META.diff
+07_dll_with_camlidl.diff
diff --git a/debian/rules b/debian/rules
index 7dbcb00..e1cebc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@
 
 include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 PACKAGE := libmlpcap-ocaml
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)

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