[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/2.0-1

Stephane Glondu steph at glondu.net
Wed Nov 16 16:58:43 UTC 2011


The following commit has been merged in the master branch:
commit e7ac969897954ccd68fd1d31a1aa7c3ca3a3fc6c
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Sep 22 21:18:58 2011 +0200

    Remove obsolete patch

diff --git a/debian/patches/0001-Missing-files-in-makefiles.patch b/debian/patches/0001-Missing-files-in-makefiles.patch
deleted file mode 100644
index 30ff130..0000000
--- a/debian/patches/0001-Missing-files-in-makefiles.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 15 Jul 2011 13:21:26 +0200
-Subject: Missing files in makefiles
-
----
- Makefile          |    7 ++++---
- Makefile.filelist |    4 +++-
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 32bca00..6fbd04b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -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:
-@@ -46,16 +46,17 @@ install:
- 	$(OCAMLFIND) install ${PACKAGENAME} \
- 	  -patch-version ${VERSION} \
- 	  META ${INTF} ${IMPL} ${NATIMPL} \
-+	  ${MLI_TO_INSTALL}
- 
- install-byte:
- 	$(OCAMLFIND) install ${PACKAGENAME} \
- 	  -patch-version ${VERSION} \
--	  META ${INTF} ${IMPL}
-+	  META ${INTF} ${IMPL} ${MLI_TO_INSTALL}
- 
- install-opt:
- 	$(OCAMLFIND) install ${PACKAGENAME} \
- 	  -patch-version ${VERSION} \
--	  META ${INTF} ${NATIMPL}
-+	  META ${INTF} ${NATIMPL} ${MLI_TO_INSTALL}
- 
- uninstall:
- 	$(OCAMLFIND) remove ${PACKAGENAME}
-diff --git a/Makefile.filelist b/Makefile.filelist
-index f99f27d..a5b7b58 100644
---- a/Makefile.filelist
-+++ b/Makefile.filelist
-@@ -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
- 
- ifeq "${NATDYNLINK}" "YES"
- DUCE_NATIMPL += lib/${LIBNAME}_duce.cmxs
-@@ -71,3 +71,5 @@ IMPL    += ${DUCE_IMPL}
- NATIMPL += ${DUCE_NATIMPL}
- DOC     += ${DUCE_DOC}
- endif
-+
-+MLI_TO_INSTALL := $(foreach X,$(INTF:.cmi=.ml),$(if $(wildcard $(X)i),$(X)i,$(X)))
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8bf7332..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Missing-files-in-makefiles.patch

-- 
tyxml packaging



More information about the Pkg-ocaml-maint-commits mailing list