[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.2.deb-2-19-gf3e1171

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit a7a7fc1ff9ae18574335d4c4e706f8e4aabbfad3
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Sat Jul 24 22:05:18 2010 +0200

    documentation-paths.diff - the manpage does not contain absolute paths anymore

diff --git a/debian/changelog b/debian/changelog
index 874c09c..10d0390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ coccinelle (0.2.3.deb-1) unstable; urgency=low
   * Removed patches:
     - system-{pycaml,menhir,ocamlsexp}.diff - upstream build system can handle
       this
+    - documentation-paths.diff - the manpage is generated using correct paths
 
- -- Євгеній Мещеряков <eugen at debian.org>  Sat, 24 Jul 2010 22:01:36 +0200
+ -- Євгеній Мещеряков <eugen at debian.org>  Sat, 24 Jul 2010 22:06:39 +0200
 
 coccinelle (0.2.2.deb-2) unstable; urgency=medium
 
diff --git a/debian/patches/documentation-paths.diff b/debian/patches/documentation-paths.diff
deleted file mode 100644
index a2f3926..0000000
--- a/debian/patches/documentation-paths.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] fix paths in documentation
-
-Upstream documentation assumes that coccinelle is installed under
-/usr/local. Patch changes this to /usr.
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- docs/spatch.1 |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/docs/spatch.1 b/docs/spatch.1
-index 87e0ec8..2448f7c 100644
---- a/docs/spatch.1
-+++ b/docs/spatch.1
-@@ -61,10 +61,10 @@ the semantic patch file
- process all files in directory recursively
- .TP
- .B -iso_file            \fI<file>\fP
--(default=/usr/local/share/coccinelle/standard.iso)
-+(default=/usr/share/coccinelle/standard.iso)
- .TP
- .B -macro_file          \fI<file>\fP
--(default=/usr/local/share/coccinelle/standard.h)
-+(default=/usr/share/coccinelle/standard.h)
- .TP
- .B -debug        
- print some information to help debug the matching process
-@@ -118,7 +118,7 @@ show summary of options.
- Apply the semantic patch foo.cocci to the C file foo.c.  The semantic patch
- is applied modulo a set of isomorphisms contained in standard.iso
- (standard.iso is by default located in
--/usr/local/share/coccinelle/standard.iso).  A patch showing the effect of
-+/usr/share/coccinelle/standard.iso).  A patch showing the effect of
- the application, if any, will be generated on the standard output.
- 
-   ./spatch -sp_file foo.cocci foo.c -o /tmp/newfoo.c
-@@ -136,18 +136,18 @@ shows selection of information about the application of
- a semantic patch to a file or directory.
- 
- .SH FILES
--.I /usr/local/share/coccinelle/standard.iso
-+.I /usr/share/coccinelle/standard.iso
- .RS
- This file contains the default set of isomorphisms.
- .RE
--.I /usr/local/share/coccinelle/standard.h
-+.I /usr/share/coccinelle/standard.h
- .RS
- This file contains the default set of macro hints.
- 
- .SH ENVIRONMENT
- .IP COCCINELLE_HOME
- The path to coccinelle share directory. Defaut is 
--.I /usr/local/share/coccinelle
-+.I /usr/share/coccinelle
- 
- .SH REFERENCES
- Y. Padioleau, J.L. Lawall, R.R Hansen, G. Muller
--- 
-tg: (db116ff..) debian/documentation-paths (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index c673f1d..2a5cb6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-documentation-paths.diff
 documentation-build.diff

-- 
Debian packaging for coccinelle