[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr421-34-gb4b81b8

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit b4b81b812fd01de59603dbb92551cc731028abec
Author: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
Date:   Sun Jun 23 22:02:12 2013 +0200

    Add DEP-3 info to the patches

diff --git a/debian/patches/debian-prefix.diff b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
similarity index 69%
rename from debian/patches/debian-prefix.diff
rename to debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
index 29e4213..d835508 100644
--- a/debian/patches/debian-prefix.diff
+++ b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
@@ -1,3 +1,14 @@
+From: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Date: Wed, 13 Feb 2013 10:23:01 +0100
+Subject: Customize installation paths for Debian packaging
+
+Forwarded: not-needed
+---
+ CONFIGME | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CONFIGME b/CONFIGME
+index 4513612..4d9c92c 100644
 --- a/CONFIGME
 +++ b/CONFIGME
 @@ -34,11 +34,11 @@
@@ -14,7 +25,7 @@
  
  # Prefix for the locale files
  localeprefix=${prefix}/share/locale
-@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || e
+@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
  # By default they will be installed into ${ocaml_libraryprefix}, but you
  # can change it if you really want to install into a different, custom prefix.
  # *No* trailing slash should be included.
diff --git a/debian/patches/hack-filesystems-path.diff b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
similarity index 67%
rename from debian/patches/hack-filesystems-path.diff
rename to debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
index f0cd889..5e6138a 100644
--- a/debian/patches/hack-filesystems-path.diff
+++ b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
@@ -1,3 +1,14 @@
+From: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Date: Wed, 13 Feb 2013 11:03:18 +0100
+Subject: Tweak file installation paths in marionnet.conf
+
+Forwarded: not-needed
+---
+ etc/marionnet.conf | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/marionnet.conf b/etc/marionnet.conf
+index 8eda75e..b7c0197 100644
 --- a/etc/marionnet.conf
 +++ b/etc/marionnet.conf
 @@ -64,10 +64,10 @@ MARIONNET_VDE_PREFIX=
diff --git a/debian/patches/series b/debian/patches/series
index 504cac6..3fb53af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian-prefix.diff
-hack-filesystems-path.diff
+0001-Customize-installation-paths-for-Debian-packaging.patch
+0002-Tweak-file-installation-paths-in-marionnet.conf.patch

-- 
marionnet packaging