[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. patched/0.1.7.deb-1-3-g1763f0c
Eugeniy Meshcheryakov
eugen at debian.org
Sat Apr 18 02:32:59 UTC 2009
The following commit has been merged in the patched branch:
commit 1763f0c0568750a04ae99b61c3f64e11e5dcfb91
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Sat Apr 18 04:32:00 2009 +0200
patches for 0.1.7.deb-2
diff --git a/debian/patches/fixes/clean-fixes.diff b/debian/patches/fixes/clean-fixes.diff
deleted file mode 100644
index a08a0d4..0000000
--- a/debian/patches/fixes/clean-fixes.diff
+++ /dev/null
@@ -1,167 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] remove generated files in clean target
-
-Remove generated files in clean target
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- Makefile | 7 +++++++
- commons/Makefile | 1 +
- ctl/Makefile | 1 +
- engine/Makefile | 1 +
- extra/Makefile | 1 +
- globals/Makefile | 1 +
- parsing_c/Makefile | 1 +
- parsing_cocci/Makefile | 1 +
- popl/Makefile | 4 ++--
- popl09/Makefile | 4 ++--
- python/Makefile | 1 +
- 11 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 20475be..fef9616 100644
---- a/Makefile
-+++ b/Makefile
-@@ -476,6 +476,13 @@ clean::
-
- clean::
- rm -f *~ .*~ *.exe #*#
-+ rm -f .depend
-+
-+distclean: clean
-+ rm -f Makefile.config
-+ rm -f python/coccilib/output.py
-+ rm -f python/pycocci.ml
-+ rm -f python/pycocci_aux.ml
-
- beforedepend::
-
-diff --git a/commons/Makefile b/commons/Makefile
-index baba40d..adeda95 100644
---- a/commons/Makefile
-+++ b/commons/Makefile
-@@ -279,6 +279,7 @@ dependencygraph2:
- clean::
- rm -f *.cm[iox] *.o *.a *.cma *.cmxa *.annot
- rm -f *~ .*~ #*#
-+ rm -f .depend
-
- clean::
- for i in $(SUBDIRS); do (cd $$i; \
-diff --git a/ctl/Makefile b/ctl/Makefile
-index 84b98d4..e174c6c 100644
---- a/ctl/Makefile
-+++ b/ctl/Makefile
-@@ -84,6 +84,7 @@ clean::
- clean::
- rm -f *.cm[iox] *.o *.annot
- rm -f *~ .*~ #*#
-+ rm -f .depend
-
- depend:
- $(OCAMLDEP) *.mli *.ml > .depend
-diff --git a/engine/Makefile b/engine/Makefile
-index 15fddb0..092d1a0 100644
---- a/engine/Makefile
-+++ b/engine/Makefile
-@@ -119,6 +119,7 @@ clean::
- rm -f *.cm[ioxa] *.o *.a *.cmxa *.annot
- clean::
- rm -f *~ .*~ gmon.out #*#
-+ rm -f .depend
-
- beforedepend::
-
-diff --git a/extra/Makefile b/extra/Makefile
-index dc26e71..fda58dc 100644
---- a/extra/Makefile
-+++ b/extra/Makefile
-@@ -63,6 +63,7 @@ clean::
-
- clean::
- rm -f *~ .*~ gmon.out #*#
-+ rm -f .depend
-
- beforedepend::
-
-diff --git a/globals/Makefile b/globals/Makefile
-index d566808..e48a01a 100644
---- a/globals/Makefile
-+++ b/globals/Makefile
-@@ -59,6 +59,7 @@ clean::
-
- clean::
- rm -f *~ .*~ gmon.out #*#
-+ rm -f .depend
-
- beforedepend::
-
-diff --git a/parsing_c/Makefile b/parsing_c/Makefile
-index 68b0c5a..d823b89 100644
---- a/parsing_c/Makefile
-+++ b/parsing_c/Makefile
-@@ -141,6 +141,7 @@ clean::
- rm -f *.cm[ioxa] *.o *.a *.cmxa *.annot
- clean::
- rm -f *~ .*~ gmon.out #*#
-+ rm -f .depend
-
- beforedepend::
-
-diff --git a/parsing_cocci/Makefile b/parsing_cocci/Makefile
-index b0044d9..a5c8f9e 100644
---- a/parsing_cocci/Makefile
-+++ b/parsing_cocci/Makefile
-@@ -123,6 +123,7 @@ clean::
- clean::
- rm -f *.cm[iox] *.o *.annot
- rm -f *~ .*~ #*#
-+ rm -f .depend
-
- depend: $(GENERATED)
- $(OCAMLDEP) *.mli *.ml > .depend
-diff --git a/popl/Makefile b/popl/Makefile
-index e7968f3..8ad23b5 100644
---- a/popl/Makefile
-+++ b/popl/Makefile
-@@ -95,8 +95,8 @@ clean::
- depend:
- $(CAMLDEP) $(INCLUDE_PATH) *.mli *.ml > .depend
-
--#clean::
--# rm -f .depend
-+clean::
-+ rm -f .depend
-
- .depend:
- $(CAMLDEP) $(INCLUDE_PATH) *.mli *.ml > .depend
-diff --git a/popl09/Makefile b/popl09/Makefile
-index 21bd4ae..ccf8242 100644
---- a/popl09/Makefile
-+++ b/popl09/Makefile
-@@ -93,8 +93,8 @@ clean::
- depend:
- $(OCAMLDEP) *.mli *.ml > .depend
-
--#clean::
--# rm -f .depend
-+clean::
-+ rm -f .depend
-
- .depend:
- $(OCAMLDEP) $(INCLUDE_PATH) *.mli *.ml > .depend
-diff --git a/python/Makefile b/python/Makefile
-index c2bf291..e6d6246 100644
---- a/python/Makefile
-+++ b/python/Makefile
-@@ -134,6 +134,7 @@ rmlinks:
- clean::
- rm -f *.cm[iox] *.o *.annot
- rm -f *~ .*~ #*#
-+ rm -f .depend
-
- beforedepend:
-
---
-tg: (b7f2651..) fixes/clean-fixes (depends on: fixes/system-pycaml)
diff --git a/debian/patches/fixes/dont-overwrite-config.diff b/debian/patches/fixes/dont-overwrite-config.diff
deleted file mode 100644
index 19d1a89..0000000
--- a/debian/patches/fixes/dont-overwrite-config.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] don't overwrite config.ml
-
-Don't overwrite globals/config.ml in-place. Instead create it
-from config.ml.in.
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- Makefile | 1 +
- configure | 2 +-
- globals/config.ml | 8 --------
- globals/config.ml.in | 8 ++++++++
- 4 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fef9616..c3ad0f6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -483,6 +483,7 @@ distclean: clean
- rm -f python/coccilib/output.py
- rm -f python/pycocci.ml
- rm -f python/pycocci_aux.ml
-+ rm -f globals/config.ml
-
- beforedepend::
-
-diff --git a/configure b/configure
-index 17533b9..c23b793 100755
---- a/configure
-+++ b/configure
-@@ -278,7 +278,7 @@ my $pythonprefix = $python ? "yes_" : "no_";
- `cd python; ln -s ${pythonprefix}pycocci_aux.ml pycocci_aux.ml;`;
- `cd python; make depend`;
-
--my $command = "perl -p -i -e 's#Not_found.\*#Not_found->\\\"$src\\\"#' globals/config.ml";
-+my $command = "perl -p -e 's#Not_found.\*#Not_found->\\\"$src\\\"#' globals/config.ml.in > globals/config.ml";
- `$command`;
-
- #
-diff --git a/globals/config.ml b/globals/config.ml
-deleted file mode 100644
-index c133614..0000000
---- a/globals/config.ml
-+++ /dev/null
-@@ -1,8 +0,0 @@
--let version = "0.1.6a"
--
--let path =
-- try (Sys.getenv "COCCINELLE_HOME")
-- with Not_found->"/usr/local/share/coccinelle"
--
--let std_iso = ref (Filename.concat path "standard.iso")
--let std_h = ref (Filename.concat path "standard.h")
-diff --git a/globals/config.ml.in b/globals/config.ml.in
-new file mode 100644
-index 0000000..c133614
---- /dev/null
-+++ b/globals/config.ml.in
-@@ -0,0 +1,8 @@
-+let version = "0.1.6a"
-+
-+let path =
-+ try (Sys.getenv "COCCINELLE_HOME")
-+ with Not_found->"/usr/local/share/coccinelle"
-+
-+let std_iso = ref (Filename.concat path "standard.iso")
-+let std_h = ref (Filename.concat path "standard.h")
---
-tg: (bc06e63..) fixes/dont-overwrite-config (depends on: fixes/clean-fixes)
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list