[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/1.91-1-8-geb1ac14
Stephane Glondu
steph at glondu.net
Sat Aug 13 17:28:55 UTC 2011
The following commit has been merged in the master branch:
commit b2977001b657a62929599c5cc5bfff453e1176b0
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Aug 13 16:10:26 2011 +0200
Refresh patch
diff --git a/debian/patches/0001-Missing-files-in-makefiles.patch b/debian/patches/0001-Missing-files-in-makefiles.patch
index 529c1d7..30ff130 100644
--- a/debian/patches/0001-Missing-files-in-makefiles.patch
+++ b/debian/patches/0001-Missing-files-in-makefiles.patch
@@ -8,19 +8,19 @@ Subject: Missing files in makefiles
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index eecb825..0c3b7dd 100644
+index 32bca00..6fbd04b 100644
--- a/Makefile
+++ b/Makefile
-@@ -23,7 +23,7 @@ distclean:
- $(MAKE) -C lib distclean
+@@ -24,7 +24,7 @@ distclean:
$(MAKE) -C syntax distclean
+ $(MAKE) -C lib distclean
$(MAKE) -C doc distclean
- -rm -f *~ \#* .\#*
+ -rm -f *~ \#* .\#* META
.PHONY: doc
doc:
-@@ -45,16 +45,17 @@ install:
+@@ -46,16 +46,17 @@ install:
$(OCAMLFIND) install ${PACKAGENAME} \
-patch-version ${VERSION} \
META ${INTF} ${IMPL} ${NATIMPL} \
@@ -41,19 +41,19 @@ index eecb825..0c3b7dd 100644
uninstall:
$(OCAMLFIND) remove ${PACKAGENAME}
diff --git a/Makefile.filelist b/Makefile.filelist
-index b0629d3..510a720 100644
+index f99f27d..a5b7b58 100644
--- a/Makefile.filelist
+++ b/Makefile.filelist
-@@ -53,7 +53,7 @@ DUCE_INTF := lib/XML_sigs_duce.cmi \
+@@ -55,7 +55,7 @@ DUCE_INTF := lib/XML_sigs_duce.cmi \
lib/XHTML_duce.cmi \
DUCE_IMPL := lib/${LIBNAME}_duce.cma
-DUCE_NATIMPL := lib/${LIBNAME}_duce.cmxa
+DUCE_NATIMPL := lib/${LIBNAME}_duce.cmxa lib/${LIBNAME}_duce.a
- DUCE_NOMLI := lib/XML_sigs_duce.mli
-
-@@ -65,3 +65,5 @@ IMPL += ${DUCE_IMPL}
+ ifeq "${NATDYNLINK}" "YES"
+ DUCE_NATIMPL += lib/${LIBNAME}_duce.cmxs
+@@ -71,3 +71,5 @@ IMPL += ${DUCE_IMPL}
NATIMPL += ${DUCE_NATIMPL}
DOC += ${DUCE_DOC}
endif
--
tyxml packaging
More information about the Pkg-ocaml-maint-commits
mailing list