[Pkg-ocaml-maint-commits] [alt-ergo] 09/15: drop patch 0009-clean-remove-META.patch

Ralf Treinen treinen at alioth.debian.org
Tue Nov 5 15:50:35 UTC 2013


This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository alt-ergo.

commit dca871a1ae01ff6f14d8d503a63f4c63e84b343a
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Tue Nov 5 15:43:12 2013 +0100

    drop patch 0009-clean-remove-META.patch
---
 debian/changelog                                   |    5 ++-
 ...ll-pack-into-two-separate-targets-opt-and.patch |   33 --------------------
 debian/patches/0009-clean-remove-META.patch        |   17 ----------
 debian/patches/series                              |    3 --
 4 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0715213..c2b6eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ alt-ergo (0.95.2-1) UNRELEASED; urgency=low
     - 0003-Fix-a-typo.patch
     - 0004-Add-rules-and-targets-for-gui.byte.patch
     - 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
+    - 0007-Fix-all-target.patch
+    - 0008-Split-install-pack-into-two-separate-targets-opt-and.patch
+    - 0009-clean-remove-META.patch
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 05 Nov 2013 14:16:57 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 05 Nov 2013 15:42:48 +0100
 
 alt-ergo (0.95.1-3) unstable; urgency=low
 
diff --git a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
deleted file mode 100644
index c1ef658..0000000
--- a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Mehdi Dogguy <mehdi at dogguy.org>
-Date: Wed, 14 Dec 2011 15:29:53 +0100
-Subject: Split install-pack into two separate targets (opt and byte)
-Forwarded: https://gforge.inria.fr/tracker/index.php?func=detail&aid=15626&group_id=2340&atid=8106
-
-Index: alt-ergo/Makefile.in
-===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-12 15:10:39.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-12 15:10:40.000000000 +0200
-@@ -256,14 +256,22 @@
- 	cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
- endif
- 
--install-pack: xpack pack META
-+install-pack-opt: xpack
- 	mkdir -p $(LIBDIR)
- 	cp -f $(LIBNAME).cmx $(LIBDIR)
- 	cp -f $(LIBNAME).o $(LIBDIR)
-+
-+install-pack-byte: pack META
-+	mkdir -p $(LIBDIR)
- 	cp -f $(LIBNAME).cmo $(LIBDIR)
- 	cp -f $(LIBNAME).cmi $(LIBDIR)
- 	cp -f META $(LIBDIR)
- 
-+install-pack:: install-pack-byte
-+ifeq ($(OCAMLBEST),opt)
-+install-pack:: install-pack-opt
-+endif
-+
- # documentation
- ###############
- 
diff --git a/debian/patches/0009-clean-remove-META.patch b/debian/patches/0009-clean-remove-META.patch
deleted file mode 100644
index ac35c26..0000000
--- a/debian/patches/0009-clean-remove-META.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: "make clean" must also remove META
-Forwarded: https://gforge.inria.fr/tracker/index.php?func=detail&aid=15615&group_id=2340&atid=8106
-
-Index: alt-ergo/Makefile.in
-===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-12 15:17:04.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-12 15:18:19.000000000 +0200
-@@ -417,7 +417,7 @@
- 	@rm -f $(GUINAME) $(GUINAME).opt $(GUINAME).byte
- 	@rm -f unittest/*.cm[iox] unittest/*.o unittest/*.annot
- 	@rm -f *.aux *.log $(NAME).tex $(NAME).dvi $(NAME).ps
--	@rm -f version.ml
-+	@rm -f version.ml META
- 	@rm -f *.$(REVISIONSUFFIX)
- 
- dist-clean distclean:: clean
diff --git a/debian/patches/series b/debian/patches/series
index 69ba50e..605b2ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 0001-No-need-to-activate-debug-flag.patch
-0007-Fix-all-target.patch
-0008-Split-install-pack-into-two-separate-targets-opt-and.patch
-0009-clean-remove-META.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git



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