[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.01.1-6-12-ge432a15

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit ab41e556b5484b0a8f17775c1fbf90fd95cc7130
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 7 18:18:55 2010 +0200

    Remove cmxs.dpatch (integrated upstream).

diff --git a/debian/changelog b/debian/changelog
index bbf2862..fd17ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ calendar (2.03-1) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * New upstream release.
+    - Remove cmxs.dpatch (integrated upstream).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 18:11:34 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 18:17:44 +0200
 
 calendar (2.01.1-6) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index aa9ae94..e0026f8 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,2 @@
 install_destdir.dpatch
-cmxs.dpatch
 meta.dpatch
diff --git a/debian/patches/cmxs.dpatch b/debian/patches/cmxs.dpatch
deleted file mode 100755
index dae77e4..0000000
--- a/debian/patches/cmxs.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## cmxs.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad calendar~/Makefile.in calendar/Makefile.in
---- calendar~/Makefile.in	2009-04-14 15:00:44.000000000 +0200
-+++ calendar/Makefile.in	2009-04-14 15:01:29.000000000 +0200
-@@ -49,7 +49,8 @@
- LIBS	= $(LIBDIR)/$(NAMELIB).cmo $(LIBDIR)/$(NAMELIB).cma
- CLIBS   =
- ifneq ($(CAMLOPT),no)
--LIBS	:= $(LIBS) $(LIBDIR)/$(NAMELIB).cmx $(LIBDIR)/$(NAMELIB).cmxa
-+LIBS	:= $(LIBS) $(LIBDIR)/$(NAMELIB).cmx \
-+        $(LIBDIR)/$(NAMELIB).cmxa $(if $(wildcard $(CAMLLIB)/dynlink.cmxa),$(LIBDIR)/$(NAMELIB).cmxs)
- CLIBS   := $(CLIBS) $(LIBDIR)/$(NAMELIB)$(OBJ_EXT) \
- 	$(LIBDIR)/$(NAMELIB)$(LIB_EXT)
- endif
-@@ -107,6 +108,9 @@
- $(LIBDIR)/$(NAMELIB).a $(LIBDIR)/$(NAMELIB).cmxa: $(LIBDIR)/$(NAMELIB).cmx 
- 	$(CAMLFIND) ocamlopt $(OPTFLAGS) -a -o $@ $<
- 
-+$(LIBDIR)/$(NAMELIB).cmxs: $(LIBDIR)/$(NAMELIB).cmxa
-+	$(CAMLFIND) ocamlopt -I $(LIBDIR) -shared -linkall -o $@ $<
-+
- src/version.ml: Makefile
- 	echo "let version = \"$(VERSION)\"" > $@
- 	echo "let date = \"`date`\"" >> $@

-- 
calendar packaging