[Pkg-ocaml-maint-commits] [marionnet] 03/07: Refresh patches

[Lucas Nussbaum]

This is an automated email from the git hooks/post-receive script.

lucas pushed a commit to branch master
in repository marionnet.

commit 50670d025ee6eea00afaeb49fc5cc15c1ef57406
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Wed Apr 2 17:03:19 2014 +0200

    Refresh patches
---
 ...e-installation-paths-for-Debian-packaging.patch | 22 ++++++++++++++--------
 ...file-installation-paths-in-marionnet.conf.patch |  2 --
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
index d835508..012420e 100644
--- a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
+++ b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
@@ -7,8 +7,6 @@ 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 @@
@@ -25,12 +23,20 @@ index 4513612..4d9c92c 100644
  
  # Prefix for the locale files
  localeprefix=${prefix}/share/locale
-@@ -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.
+@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
+ # library or 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.
--libraryprefix=${ocaml_libraryprefix}
-+libraryprefix=${prefix}/${ocaml_libraryprefix}
+-libraryprefix=$(which 1>/dev/null ocamlfind && ocamlfind query lablgtk2)
+-libraryprefix=${libraryprefix%/lablgtk2}
+-libraryprefix=${libraryprefix:-$ocaml_libraryprefix}
++#libraryprefix=/$(which 1>/dev/null ocamlfind && ocamlfind query lablgtk2)
++#libraryprefix=/${libraryprefix%/lablgtk2}
++#libraryprefix=/${libraryprefix:-$ocaml_libraryprefix}
  #
  # This definition may be appropriate for debian packaging:
- #libraryprefix=debian/tmp/${ocaml_libraryprefix}
+-#libraryprefix=debian/tmp/${ocaml_libraryprefix}
++libraryprefix=${prefix}/${ocaml_libraryprefix}
+ 
+ # This should be defined as the absolute path to a directory containing
+ # the already configured OCaml source; in alternative, is your GNU/Linux
diff --git a/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
index 5e6138a..a4ebcf1 100644
--- a/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
+++ b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
@@ -7,8 +7,6 @@ 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=

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git