The following commit has been merged in the master branch:
commit 4e2494effcb87651f017a1e30c39f06556c46b80
Author: Lucas Nussbaum <lu...@debian.org>
Date:   Sat Dec 1 18:16:25 2012 +0100

    Convert package to 3.0 (quilt).

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d91fa75..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_adapt_debian
-02_remove_dbug_print
-03_compatibility_withdash_fixbug
-04_solve_meta_lacks_dependancies
diff --git a/debian/patches/01_adapt_debian.dpatch 
b/debian/patches/01_adapt_debian.diff
old mode 100755
new mode 100644
similarity index 58%
rename from debian/patches/01_adapt_debian.dpatch
rename to debian/patches/01_adapt_debian.diff
index 0aace05..114687d
--- a/debian/patches/01_adapt_debian.dpatch
+++ b/debian/patches/01_adapt_debian.diff
@@ -7,42 +7,55 @@
 
 @DPATCH@
 
-diff -rN -u ocamlbricks-0.50.1-orig/CONFIGME ocamlbricks-0.50.1/CONFIGME
---- ocamlbricks-0.50.1-orig/CONFIGME   2008-05-12 23:46:28.000000000 +0200
-+++ ocamlbricks-0.50.1/CONFIGME        2008-05-13 01:52:53.000000000 +0200
-@@ -32,21 +32,23 @@
+--- a/CONFIGME
++++ b/CONFIGME
+@@ -33,12 +33,15 @@
  # Section 2: Installation setup: prefixes, and the like
  ###########################################################################
  
--# Installation prefix for OCaml libraries: they will be installed into
 +# Change for Debian Packaging
 +DESTDIR=$PWD"/debian/tmp"
 +
+ # Installation prefix for OCaml libraries: they will be installed into
  # $prefix/$name, where $name is the package name defined in META.
  # This is a reasonable default, but you can change it if you really want
  # to install into a different, custom prefix.
  # *No* trailing slash should be included.
 -libraryprefix=`ocamlc -where || exit -1`
--#libraryprefix=/mystrangepath
-+#libraryprefix=`ocamlc -where || exit -1`
 +libraryprefix=$DESTDIR/`ocamlc -where || exit -1`
+ #libraryprefix=/mystrangepath
+ 
+ # This should be defined as the absolute path to a directory containing
+@@ -48,7 +51,7 @@ libraryprefix=`ocamlc -where || exit -1`
+ # the directory containing OCaml headers.  
+ #
+ # This definition is appropriate for debian-like distributions:
+-ocaml_sources=/usr/include/caml
++ocaml_sources=$DESTDIR/usr/include/caml
+ #
+ # This is reasonable if you have downloaded and configured the OCaml
+ # sources yourself, somewhere:
+@@ -56,14 +59,14 @@ ocaml_sources=/usr/include/caml
  
  # Installation prefix, for example /usr or /usr/local
  # *No* trailing slash should be included.
 -prefix=/usr/local
-+prefix=$DESTDIR"/usr"
++prefix=$DESTDIR/usr
  
  # Prefix for host-wide configuration files; you should probably keep the
  # default setting:
 -configurationprefix=/etc
-+configurationprefix=$DESTDIR"/etc"
++configurationprefix=$DESTDIR/etc
+ 
+ # Prefix for the locale files
+-localeprefix=/usr/share/locale
++localeprefix=$DESTDIR/usr/share/locale
  
  # Prefix for documentation files; you should probably keep the
  # default setting:
-diff -rN -u ocamlbricks-0.50.1-orig/Makefile ocamlbricks-0.50.1/Makefile
---- ocamlbricks-0.50.1-orig/Makefile   2008-05-12 23:46:29.000000000 +0200
-+++ ocamlbricks-0.50.1/Makefile        2008-05-13 01:52:57.000000000 +0200
-@@ -349,6 +349,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -442,6 +442,7 @@ install-libraries: libraries install-lib
          cp -f META $(OTHER_LIBRARY_FILES_TO_INSTALL) \
                _build/*.cma _build/*.cmxa _build/*.a \
                `find _build/ -name \*.cmi | grep -v /myocamlbuild` \
@@ -50,15 +63,15 @@ diff -rN -u ocamlbricks-0.50.1-orig/Makefile 
ocamlbricks-0.50.1/Makefile
                `find _build/ -name \*.mli | grep -v /myocamlbuild` \
              $$libraryprefix/$$name/) && \
          echo 'Library installation was successful.'; \
-@@ -574,9 +575,9 @@
+@@ -670,9 +671,9 @@ NATIVE_OR_BYTE = \
  # -byte-plugin if needed:
  OCAMLBUILD_COMMAND_LINE = \
        (if [ $$( $(call NATIVE_OR_BYTE) ) == 'byte' ]; then \
--        echo 'ocamlbuild -byte-plugin'; \
-+        echo 'ocamlbuild -byte-plugin -classic-display'; \
+-        echo 'ocamlbuild -byte-plugin -verbose 2 -log _build/_log'; \
++        echo 'ocamlbuild -byte-plugin -classic-display -verbose 2 -log 
_build/_log'; \
        else \
--        echo 'ocamlbuild'; \
-+        echo 'ocamlbuild -classic-display'; \
+-        echo 'ocamlbuild -verbose 2 -log _build/_log'; \
++        echo 'ocamlbuild -classic-display -verbose 2 -log _build/_log'; \
        fi)
  
  # Macro extracting, via source, the value associated to some keys
diff --git a/debian/patches/02_remove_dbug_print.dpatch 
b/debian/patches/02_remove_dbug_print.dpatch
deleted file mode 100755
index 9748b83..0000000
--- a/debian/patches/02_remove_dbug_print.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_dbug_print.dpatch by Sylvain Le Gall <gil...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove debug print statement.
-
-@DPATCH@
-diff -urNad ocamlbricks~/SHELL/shell.ml ocamlbricks/SHELL/shell.ml
---- ocamlbricks~/SHELL/shell.ml        2008-06-16 23:48:47.000000000 +0200
-+++ ocamlbricks/SHELL/shell.ml 2008-06-17 00:40:17.000000000 +0200
-@@ -391,6 +391,6 @@
- (** Check if a file with the given name can be created by the current user. *)
- let freshname_possible x =
-   let d = (Filename.dirname x) in 
--  prerr_endline ("freshname_possible: x="^x^" d="^d) ; 
-+  (*prerr_endline ("freshname_possible: x="^x^" d="^d) ; *)
-   (dir_writable d)
-  ;; 
diff --git a/debian/patches/03_compatibility_withdash_fixbug.dpatch 
b/debian/patches/03_compatibility_withdash_fixbug.dpatch
deleted file mode 100755
index 4e4de40..0000000
--- a/debian/patches/03_compatibility_withdash_fixbug.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_compatibility_withdash_fixbug.dpatch by  <roudi...@lipn.univ-paris13.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replaced source with . for dash compatibility; also explicitly invoke 
-## DP: bash in UnixExtra.run
-
-@DPATCH@
-
-diff -ru ocamlbricks_orig/CONFIGURATION/configuration_files.ml 
ocamlbricks/CONFIGURATION/configuration_files.ml
---- ocamlbricks_orig/CONFIGURATION/configuration_files.ml      2009-03-25 
02:26:21.000000000 +0100
-+++ ocamlbricks/CONFIGURATION/configuration_files.ml   2009-03-25 
02:42:54.000000000 +0100
-@@ -58,7 +58,9 @@
- let output_of_file_name file_name variables =
-   try
-     let source_command_line =
--      Printf.sprintf "set -e; (source %s 2> /dev/null &&" file_name in
-+    (* This is very important: dash does not support "source", you have to 
use the
-+       less readable, but more portable, ".": *)
-+      Printf.sprintf "set -e; (. %s 2> /dev/null &&" file_name in
-     let command_line =
-       List.fold_left
-         (fun string variable ->
-diff -ru ocamlbricks_orig/EXTRA/unixExtra.ml ocamlbricks/EXTRA/unixExtra.ml
---- ocamlbricks_orig/EXTRA/unixExtra.ml        2009-03-25 02:26:21.000000000 
+0100
-+++ ocamlbricks/EXTRA/unixExtra.ml     2009-03-25 02:40:48.000000000 +0100
-@@ -366,7 +366,7 @@
-         ((" <"^name),name) 
-       end
-   in 
--  let code = Unix.system(script^" >"^output^input_option) in 
-+  let code = Unix.system("bash -c " ^script^" >"^output^input_option) in
-   let str = (cat output) in
-   begin
-     if trace then begin 
diff --git a/debian/patches/04_solve_meta_lacks_dependancies.dpatch 
b/debian/patches/04_solve_meta_lacks_dependancies.dpatch
deleted file mode 100755
index 92492f5..0000000
--- a/debian/patches/04_solve_meta_lacks_dependancies.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_solve_meta_lacks_dependancies.dpatch by <roudi...@lipn.univ-paris13.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Solve META lacks dependencies
-
-@DPATCH@
-
---- ocamlbricks/META   2009-03-29 17:45:33.000000000 +0200
-+++ ../ocamlbricks/META        2009-03-29 17:57:18.000000000 +0200
-@@ -2,7 +2,7 @@
- version="0.50.1"
- descriton = "A general-purpose library of reusable small code bricks"
- directory = "+ocamlbricks"
--requires = "lablgtk2"
-+requires = "lablgtk2 unix str"
- archive(syntax,preprocessor) = "-thread"
- archive(byte,mt) = "ocamlbricks.cma"
- archive(native) = "ocamlbricks.cmxa"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..15bef37
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_adapt_debian.diff
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)

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