[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.5+debian-1-15-g8b51437
Stephane Glondu
steph at glondu.net
Sat Feb 12 11:09:22 UTC 2011
The following commit has been merged in the master branch:
commit 2423a2c183bbc07728ecb57bd3b5be2683c6c79a
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Feb 12 10:28:59 2011 +0100
Switch source package format to 3.0 (quilt) and refresh patches
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
index 46c5b82..0b0d4c1 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,12 +1,6 @@
Debian source package for Findlib
=================================
-Patching upstream sources
--------------------------
-
-This package uses dpatch for patching the source. Please consider
-reading dpatch manpage to patch the source.
-
Repackaging upstream sources
----------------------------
@@ -19,4 +13,4 @@ of the documentation, taken from SVN.
The file tools/make-package-macosx has different copyright and
license, and is useless to Debian; it has been removed.
- -- Stéphane Glondu <glondu at debian.org>, Sat, 26 Sep 2009 10:13:52 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Sat, 12 Feb 2011 10:30:07 +0100
diff --git a/debian/control b/debian/control
index 8af18e2..69807fd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends:
camlp4,
m4,
gawk | awk,
- dpatch,
cdbs,
dh-ocaml (>= 0.9)
Standards-Version: 3.8.3
diff --git a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch
new file mode 100644
index 0000000..8b1a522
--- /dev/null
+++ b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch
@@ -0,0 +1,25 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Sat, 12 Feb 2011 10:17:31 +0100
+Subject: [PATCH] Change standard directories to conform our own policy
+
+Patch upstream findlib.conf.in so that:
+ - default "manual" installation dir is /usr/local/lib/ocaml/<version>
+ - findlib path look first in /usr/local/lib... and then in the
+ standard ocaml library: this permit local overrides of libraries
+
+Forwarded: not-needed
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ findlib.conf.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/findlib.conf.in b/findlib.conf.in
+index 261d2c8..05f6c3d 100644
+--- a/findlib.conf.in
++++ b/findlib.conf.in
+@@ -1,2 +1,2 @@
+-destdir="@SITELIB@"
+-path="@SITELIB@"
++destdir="/usr/local/lib/ocaml/@OCamlABI@"
++path="/usr/local/lib/ocaml/@OCamlABI@:@SITELIB@:@SITELIB@/METAS"
+--
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch
new file mode 100644
index 0000000..f103d30
--- /dev/null
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -0,0 +1,59 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Sat, 12 Feb 2011 10:21:40 +0100
+Subject: [PATCH] Extra configuration search path
+
+Support for an extra, debian-specific, dir where to look for
+configuration file snippets (namely /usr/share/ocaml-findlib/).
+
+Forwarded: not-needed
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/findlib/findlib.ml | 9 ++++++++-
+ src/findlib/findlib_config.mlp | 1 +
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
+index b8dbdc5..bdaefee 100644
+--- a/src/findlib/findlib.ml
++++ b/src/findlib/findlib.ml
+@@ -103,6 +103,8 @@ let init
+ let configd_file =
+ config_file ^ ".d" in
+
++ let extra_configd_file = Findlib_config.extra_configd_file in
++
+ let vars_of_file f =
+ let ch = open_in f in
+ try
+@@ -140,12 +142,17 @@ let init
+ vars_of_file config_file
+ else
+ [] in
++ let extra_configd_vars = (* Debian specific *)
++ if Sys.file_exists extra_configd_file then
++ vars_of_dir extra_configd_file
++ else
++ [] in
+ let configd_vars =
+ if Sys.file_exists configd_file then
+ vars_of_dir configd_file
+ else
+ [] in
+- let vars = config_vars @ configd_vars in
++ let vars = extra_configd_vars @ config_vars @ configd_vars in
+ if vars <> [] then (
+ let lookup name default =
+ try Fl_metascanner.lookup name config_preds vars
+diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp
+index 5b4ab69..09d0089 100644
+--- a/src/findlib/findlib_config.mlp
++++ b/src/findlib/findlib_config.mlp
+@@ -4,6 +4,7 @@
+ *)
+
+ let config_file = "@CONFIGFILE@";;
++let extra_configd_file = "/usr/share/ocaml-findlib/";; (* Debian specific *)
+
+ let ocaml_stdlib = "@STDLIB@";;
+
+--
diff --git a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch
new file mode 100644
index 0000000..0e17081
--- /dev/null
+++ b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch
@@ -0,0 +1,35 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Sat, 12 Feb 2011 10:23:55 +0100
+Subject: [PATCH] META.num*: bugfix, moved "directory" directive outside "core" subpackage
+
+---
+ site-lib-src/num-top/META.in | 1 +
+ site-lib-src/num/META.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/site-lib-src/num-top/META.in b/site-lib-src/num-top/META.in
+index 184d65f..1b18b74 100644
+--- a/site-lib-src/num-top/META.in
++++ b/site-lib-src/num-top/META.in
+@@ -3,5 +3,6 @@ dnl This file is input of the m4 macro processor.
+ `requires = "num.core"'
+ `version = "'findlib_version`"'
+ `description = "Add-on for num inside toploops"'
++`directory = "+num-top"'
+ `archive(byte,toploop) = "num_top.cma"'
+
+diff --git a/site-lib-src/num/META.in b/site-lib-src/num/META.in
+index 16e1946..489bc8e 100644
+--- a/site-lib-src/num/META.in
++++ b/site-lib-src/num/META.in
+@@ -4,8 +4,8 @@ dnl This file is input of the m4 macro processor.
+ `requires(toploop) = "num.core,num-top"'
+ `version = "[distributed with Ocaml]"'
+ `description = "Arbitrary-precision rational arithmetic"'
++`directory = "^"'
+ `package "core" ('
+-` directory = "^"'
+ ` version = "[internal]"'
+ ` browse_interfaces = "'interfaces`"'
+ ` archive(byte) = "nums.cma"'
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ea44008..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-stddirs.dpatch
-include.dpatch
-site_lib_metas.dpatch
diff --git a/debian/patches/include.dpatch b/debian/patches/include.dpatch
deleted file mode 100755
index 7656369..0000000
--- a/debian/patches/include.dpatch
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23_include.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: support for an extra, debian-specific, dir where to look for
-## DP: configuration file snippets (namely /usr/share/ocaml-findlib/)
-
- at DPATCH@
-diff -urNad trunk~/src/findlib/findlib_config.mlp trunk/src/findlib/findlib_config.mlp
---- trunk~/src/findlib/findlib_config.mlp 2005-11-01 01:36:35.000000000 +0100
-+++ trunk/src/findlib/findlib_config.mlp 2005-11-27 22:57:44.000000000 +0100
-@@ -4,6 +4,7 @@
- *)
-
- let config_file = "@CONFIGFILE@";;
-+let extra_configd_file = "/usr/share/ocaml-findlib/";; (* Debian specific *)
-
- let ocaml_stdlib = "@STDLIB@";;
-
-diff -urNad trunk~/src/findlib/findlib.ml trunk/src/findlib/findlib.ml
---- trunk~/src/findlib/findlib.ml 2005-11-01 01:36:35.000000000 +0100
-+++ trunk/src/findlib/findlib.ml 2005-11-27 22:58:07.000000000 +0100
-@@ -99,6 +99,8 @@
- let configd_file =
- config_file ^ ".d" in
-
-+ let extra_configd_file = Findlib_config.extra_configd_file in
-+
- let vars_of_file f =
- let ch = open_in config_file in
- try
-@@ -136,12 +138,17 @@
- vars_of_file config_file
- else
- [] in
-+ let extra_configd_vars = (* Debian specific *)
-+ if Sys.file_exists extra_configd_file then
-+ vars_of_dir extra_configd_file
-+ else
-+ [] in
- let configd_vars =
- if Sys.file_exists configd_file then
- vars_of_dir configd_file
- else
- [] in
-- let vars = config_vars @ configd_vars in
-+ let vars = extra_configd_vars @ config_vars @ configd_vars in
- if vars <> [] then (
- let lookup name default =
- try Fl_metascanner.lookup name config_preds vars
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..08faec1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Change-standard-directories-to-conform-our-own-polic.patch
+0002-Extra-configuration-search-path.patch
+0003-META.num-bugfix-moved-directory-directive-outside-co.patch
diff --git a/debian/patches/site_lib_metas.dpatch b/debian/patches/site_lib_metas.dpatch
deleted file mode 100755
index a83c04e..0000000
--- a/debian/patches/site_lib_metas.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## site_lib_metas.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: META.num*: bugfix, moved "directory" directive outside "core" subpackage
-
- at DPATCH@
-diff -urNad trunk~/site-lib-src/num/META.in trunk/site-lib-src/num/META.in
---- trunk~/site-lib-src/num/META.in 2004-01-11 16:05:51.000000000 +0100
-+++ trunk/site-lib-src/num/META.in 2004-01-11 16:05:52.000000000 +0100
-@@ -4,8 +4,8 @@
- `requires(toploop) = "num.core,num-top"'
- `version = "[distributed with Ocaml]"'
- `description = "Arbitrary-precision rational arithmetic"'
-+`directory = "^"'
- `package "core" ('
--` directory = "^"'
- ` version = "[internal]"'
- ` browse_interfaces = "'interfaces`"'
- ` archive(byte) = "nums.cma"'
-diff -urNad trunk~/site-lib-src/num-top/META.in trunk/site-lib-src/num-top/META.in
---- trunk~/site-lib-src/num-top/META.in 2004-01-11 16:05:51.000000000 +0100
-+++ trunk/site-lib-src/num-top/META.in 2004-01-11 16:05:52.000000000 +0100
-@@ -3,5 +3,6 @@
- `requires = "num.core"'
- `version = "'findlib_version`"'
- `description = "Add-on for num inside toploops"'
-+`directory = "+num-top"'
- `archive(byte,toploop) = "num_top.cma"'
-
diff --git a/debian/patches/stddirs.dpatch.in b/debian/patches/stddirs.dpatch.in
deleted file mode 100644
index f210943..0000000
--- a/debian/patches/stddirs.dpatch.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh -e
-## 17_stddirs.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch upstream findlib.conf.in so that:
-## DP: - default "manual" installation dir is /usr/local/lib/ocaml/3.08
-## DP: - findlib path look first in /usr/local/lib... and then in the
-## DP: standard ocaml library this permit local overrides of libraries
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
-diff -urNad trunk~/findlib.conf.in trunk/findlib.conf.in
---- trunk~/findlib.conf.in 2005-11-01 00:36:34.000000000 +0000
-+++ trunk/findlib.conf.in 2005-11-12 18:12:11.000000000 +0000
-@@ -1,2 +1,2 @@
--destdir="@SITELIB@"
--path="@SITELIB@"
-+destdir="/usr/local/lib/ocaml/@OCamlABI@"
-+path="/usr/local/lib/ocaml/@OCamlABI@:@SITELIB@:@SITELIB@/METAS"
diff --git a/debian/rules b/debian/rules
index b446737..ba73e0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/ocaml.mk
include /usr/share/cdbs/1/class/makefile.mk
PKGNAME = ocaml-findlib
DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp
-OCAML_IN_FILES += debian/patches/stddirs.dpatch
configure/$(PKGNAME)::
rm -f README # just a symlink, the good one is doc/README
@@ -26,6 +24,7 @@ endif
install/$(PKGNAME)::
# rm ocamlc.opt and similar settings, they're not avail everywhere in debian
grep -v \\.opt debian/tmp/etc/ocamlfind.conf > debian/ocamlfind.conf.new
+ sed -i -e 's/@OCamlABI@/$(OCAML_ABI)/g' debian/ocamlfind.conf.new
mv debian/ocamlfind.conf.new debian/tmp/etc/ocamlfind.conf
# mv METAs from empty directories to the /META directory
mkdir -p $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/METAS
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 74e8889..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-findlib source: dpatch-index-references-non-existent-patch stddirs.dpatch
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
--
findlib packaging
More information about the Pkg-ocaml-maint-commits
mailing list