[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.4.0-2-8-g43819a1

Stephane Glondu steph at glondu.net
Tue Jun 30 19:01:51 UTC 2009


The following commit has been merged in the master branch:
commit 0859310b3d8fbe109f627a4d529dcc1f158f792f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 30 20:42:38 2009 +0200

    Switch patch system to quilt

diff --git a/debian/control b/debian/control
index 9762d05..75d4bba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,15 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, ocaml-nox (>= 3.11), camlp4 (>= 3.11), libsqlite3-dev (>= 3.3.9), ocaml-findlib (>= 1.2.4), dh-ocaml (>= 0.2)
+Build-Depends:
+ debhelper (>= 7),
+ dpkg-dev (>= 1.13.19),
+ quilt,
+ ocaml-nox (>= 3.11),
+ camlp4 (>= 3.11),
+ libsqlite3-dev (>= 3.3.9),
+ ocaml-findlib (>= 1.2.4),
+ dh-ocaml (>= 0.2)
 Standards-Version: 3.8.1
 Section: ocaml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git
diff --git a/debian/patches/install-no-mktop.dpatch b/debian/patches/0001-Install-no-mktop.patch
old mode 100755
new mode 100644
similarity index 55%
rename from debian/patches/install-no-mktop.dpatch
rename to debian/patches/0001-Install-no-mktop.patch
index afc1501..bd81aeb
--- a/debian/patches/install-no-mktop.dpatch
+++ b/debian/patches/0001-Install-no-mktop.patch
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install-no-mktop.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow installation without building in native mode.
+From: Samuel Mimram <smimram at debian.org>
+Date: Tue, 30 Jun 2009 20:38:46 +0200
+Subject: [PATCH] Install no mktop
 
- at DPATCH@
-diff -urNad ocaml-sqlite3-0.16.0~/Makefile.in ocaml-sqlite3-0.16.0/Makefile.in
---- ocaml-sqlite3-0.16.0~/Makefile.in	2007-05-05 11:34:30.000000000 +0200
-+++ ocaml-sqlite3-0.16.0/Makefile.in	2007-05-05 11:35:32.000000000 +0200
-@@ -31,13 +31,9 @@
+Allow installation without building in native mode
+---
+ Makefile.in |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 590cb89..3c6d838 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,13 +38,9 @@ clean:
  distclean: clean
  	rm -rf autom4te.* config.* META Makefile doc
  
@@ -24,3 +27,4 @@ diff -urNad ocaml-sqlite3-0.16.0~/Makefile.in ocaml-sqlite3-0.16.0/Makefile.in
  
  remove: uninstall
  uninstall:
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4000787..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-install-no-mktop
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4afb03c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Install-no-mktop.patch
diff --git a/debian/rules b/debian/rules
index 706ac42..b660da5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
 

-- 
ocaml-sqlite3 packaging



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