[Pkg-ocaml-maint-commits] [pxp] 04/08: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Fri Aug 12 12:28:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository pxp.
commit 7bf2a9ee364e8733cf09fadd4cdff49c08ab52e1
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Aug 12 14:05:29 2016 +0200
Refresh patches
---
...iles-so-that-stuff-is-installed-under-DES.patch | 37 +++++++---------------
...d-dependending-on-a-missing-.txt-document.patch | 5 ++-
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch b/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
index 84a3f6c..037c86b 100644
--- a/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
+++ b/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
@@ -3,22 +3,21 @@ Date: Thu, 21 Jul 2011 20:46:33 +0200
Subject: Patch Makefiles so that stuff is installed under $(DESTDIR)
---
- Makefile | 2 +-
- Makefile.rules | 2 +-
- gensrc/pxp-lex-pattern/Makefile.in | 2 +-
- gensrc/pxp-ulex-utf8/Makefile | 2 +-
- gensrc/pxp-wlex-utf8/Makefile | 2 +-
- gensrc/pxp-wlex/Makefile | 2 +-
- src/pxp-engine/Makefile | 2 +-
- src/pxp-pp/Makefile | 2 +-
- src/pxp/Makefile | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
+ Makefile | 2 +-
+ gensrc/pxp-lex-pattern/Makefile.in | 2 +-
+ gensrc/pxp-ulex-utf8/Makefile | 2 +-
+ gensrc/pxp-wlex-utf8/Makefile | 2 +-
+ gensrc/pxp-wlex/Makefile | 2 +-
+ src/pxp-engine/Makefile | 2 +-
+ src/pxp-pp/Makefile | 2 +-
+ src/pxp/Makefile | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
-index 86cef90..e2ae4b3 100644
+index 7b1cc82..97afc74 100644
--- a/Makefile
+++ b/Makefile
-@@ -59,7 +59,7 @@ clean:
+@@ -63,7 +63,7 @@ clean:
CLEAN: clean
.PHONY: distclean
@@ -27,19 +26,6 @@ index 86cef90..e2ae4b3 100644
rm -f *~ Makefile.conf
$(MAKE) -C tools distclean
$(MAKE) -C src distclean
-diff --git a/Makefile.rules b/Makefile.rules
-index c90e054..829227a 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -4,7 +4,7 @@
-
- # How to invoke compilers and tools:
-
--OCAMLC = $(OCAMLFIND) ocamlc -g $(OCAMLC_OPTIONS) -package "$(PACKAGES)"
-+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_OPTIONS) -package "$(PACKAGES)"
- OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPT_OPTIONS) -package "$(PACKAGES)"
- OCAMLDEP = ocamldep $(OCAMLDEP_OPTIONS)
- OCAMLFIND = ocamlfind
diff --git a/gensrc/pxp-lex-pattern/Makefile.in b/gensrc/pxp-lex-pattern/Makefile.in
index 5408e3f..d1e1074 100644
--- a/gensrc/pxp-lex-pattern/Makefile.in
@@ -131,4 +117,3 @@ index 8c1a57b..0c00474 100644
uninstall:
$(OCAMLFIND) remove pxp
---
diff --git a/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch b/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch
index 3ab97e0..490e4e6 100644
--- a/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch
+++ b/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch
@@ -3,11 +3,11 @@ Date: Thu, 21 Jul 2011 20:47:05 +0200
Subject: Avoid dependending on a missing .txt document
---
- src/pxp-engine/Makefile.code | 3 +--
+ src/pxp-engine/Makefile.code | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/pxp-engine/Makefile.code b/src/pxp-engine/Makefile.code
-index 72b7fab..88a588e 100644
+index 23cb49e..acb4b8d 100644
--- a/src/pxp-engine/Makefile.code
+++ b/src/pxp-engine/Makefile.code
@@ -22,8 +22,7 @@ DOC = pxp_types.mli pxp_document.mli pxp_dtd.mli pxp_tree_parser.mli \
@@ -20,4 +20,3 @@ index 72b7fab..88a588e 100644
XOBJ = $(OBJ:.cmo=.cmx)
---
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/pxp.git
More information about the Pkg-ocaml-maint-commits
mailing list