[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 d21a26dae03406ea86fabedc98122f65105f177f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 7 18:22:00 2010 +0200

    Remove meta.dpatch (integrated upstream).

diff --git a/debian/changelog b/debian/changelog
index fd17ba1..842d360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ calendar (2.03-1) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * New upstream release.
     - Remove cmxs.dpatch (integrated upstream).
+    - Remove meta.dpatch (integrated upstream).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 18:17:44 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 18:21:39 +0200
 
 calendar (2.01.1-6) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index e0026f8..806a429 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
 install_destdir.dpatch
-meta.dpatch
diff --git a/debian/patches/meta.dpatch b/debian/patches/meta.dpatch
deleted file mode 100755
index 7f681c5..0000000
--- a/debian/patches/meta.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## meta.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
-##
-## DP: Allow any executable to be linked using ocamlfind.
-
- at DPATCH@
-diff -urNad calendar~/Makefile.in calendar/Makefile.in
---- calendar~/Makefile.in	2009-03-09 13:48:10.000000000 +0100
-+++ calendar/Makefile.in	2009-03-18 17:54:02.000000000 +0100
-@@ -114,8 +114,8 @@
- META: Makefile
- 	echo "description = \"$(NAME) library\"" > $@
- 	echo "version = \"$(VERSION)\"" >> $@
--	echo "archive(byte) = \"$(NAMELIB).cmo $(NAMELIB).cma\"" >> $@
--	echo "archive(native) = \"$(NAMELIB).cmx $(NAMELIB).cmxa\"" >> $@
-+	echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@
-+	echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@
- 	echo "requires = \"unix str\"" >> $@
- 
- # Generic rules

-- 
calendar packaging