This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet.
commit 2fac9dcf2ce52cfeb46e851dbca4ccb25a1e7f54 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 9 08:08:38 2017 +0200 Refresh patches --- ...Customize-installation-paths-for-Debian-packaging.patch | 14 +++++++++----- debian/patches/0003-Tweak-ocamldep-search-path.patch | 8 ++++---- 2 files changed, 13 insertions(+), 9 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 012420e..ac7640d 100644 --- a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch +++ b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch @@ -9,21 +9,25 @@ Forwarded: not-needed --- a/CONFIGME +++ b/CONFIGME -@@ -34,11 +34,11 @@ - - # Installation prefix, for example /usr or /usr/local +@@ -35,7 +35,7 @@ + # Run-time prefix, where resources will be really installed and available + # when the software will be launched. Examples are /usr or /usr/local. # *No* trailing slash should be included. -prefix=/usr/local +prefix=${DESTDIR:-debian/tmp}/usr + # Prefix for temporary or final installation; you should probably keep the + # default setting, which is ${prefix}. This variable has been introduced to +@@ -45,7 +45,7 @@ prefix_install=${prefix} + # Prefix for host-wide configuration files; you should probably keep the # default setting: -configurationprefix=/etc +configurationprefix=${DESTDIR:-debian/tmp}/etc - # Prefix for the locale files + # Prefix for the locale files (at run-time) localeprefix=${prefix}/share/locale -@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e +@@ -69,12 +69,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. diff --git a/debian/patches/0003-Tweak-ocamldep-search-path.patch b/debian/patches/0003-Tweak-ocamldep-search-path.patch index 24c98a0..ad55c84 100644 --- a/debian/patches/0003-Tweak-ocamldep-search-path.patch +++ b/debian/patches/0003-Tweak-ocamldep-search-path.patch @@ -1,11 +1,11 @@ --- a/Makefile.local +++ b/Makefile.local -@@ -22,7 +22,7 @@ DIRECTORIES_TO_INCLUDE = camlp4 threads - LIBRARIES_TO_LINK = unix threads str lablgtk lablglade lablgtksourceview2 ocamlbricks +@@ -24,7 +24,7 @@ LIBRARIES_TO_LINK = unix threads str lab C_OBJECTS_TO_LINK += + EXCLUDE_FROM_SOURCE_FINDING=uml -OCAMLBRICKS=$(LIBRARYPREFIX)/ocamlbricks +OCAMLBRICKS=$(OCAML_LIBRARYPREFIX)/ocamlbricks - PP_OPTION = camlp4of -I $(OCAMLBRICKS) gettext_extract_pot_p4.cmo option_extract_p4.cmo raise_p4.cmo log_module_loading_p4.cmo -I chip - OBJECTS_TO_LINK = gtkThread + # Transmit the information about the compiler version in order to activate conditional compilation: + # Empty for OCaml 3.x.y series, set to "-DOCAML4_02_OR_LATER" for 4.02.y or later: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git _______________________________________________ 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