[Pkg-ocaml-maint-commits] [SCM] ocaml-inotify packaging branch, master, updated. debian/0.7-1-1-gc1cdcc5

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 320ab4038dce18dad184590dd63113c8cbd218ff
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Jul 28 22:41:40 2008 +0200

    New Upstream Version
    
    * Remove patch 01_nogcc, 02_META and 03_ocamlopt which have been applied
      upstream
    * Prevent removal of ocaml-sqlite3 in the clean process

diff --git a/debian/changelog b/debian/changelog
index 73a25d3..e0d2269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml-inotify (0.6-2) UNRELEASED; urgency=low
+ocaml-inotify (0.7-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New Upstream Version:
+    * Remove patch 01_nogcc, 02_META and 03_ocamlopt which have been applied
+      upstream
+    * Prevent removal of ocaml-sqlite3 in the clean process
 
- -- Sylvain Le Gall <gildor at debian.org>  Sun, 08 Jun 2008 22:31:50 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 28 Jul 2008 22:32:34 +0200
 
 ocaml-inotify (0.6-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index cf3b99b..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +0,0 @@
-01_nogcc
-02_meta
-03_ocamlopt
diff --git a/debian/patches/01_nogcc.dpatch b/debian/patches/01_nogcc.dpatch
deleted file mode 100755
index bf72d5b..0000000
--- a/debian/patches/01_nogcc.dpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_nogcc.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replace gcc call by ocamlc.
-
- at DPATCH@
-diff -urNad ocaml-inotify~/Makefile ocaml-inotify/Makefile
---- ocaml-inotify~/Makefile	2008-06-08 12:37:26.000000000 +0200
-+++ ocaml-inotify/Makefile	2008-06-08 12:38:46.000000000 +0200
-@@ -1,5 +1,3 @@
--CC = gcc
--CFLAGS = -Wall -fPIC -O2
- OCAMLC = ocamlc
- OCAMLOPT = ocamlopt
- 
-@@ -44,7 +42,7 @@
- 	$(OCAMLOPT) $(OCAMLOPTFLAGS) -c -o $@ $<
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(OCAMLC) -c -o $@ $<
- 
- .PHONY: install
- install: $(LIBS)
diff --git a/debian/patches/02_meta.dpatch b/debian/patches/02_meta.dpatch
deleted file mode 100755
index 78c31de..0000000
--- a/debian/patches/02_meta.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_meta.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: State the dependency to Unix OCaml library in META.
-
- at DPATCH@
-diff -urNad ocaml-inotify~/META ocaml-inotify/META
---- ocaml-inotify~/META	2008-06-08 16:07:54.000000000 +0200
-+++ ocaml-inotify/META	2008-06-08 16:08:25.000000000 +0200
-@@ -1,3 +1,5 @@
- version="0.6"
-+description="Linux inotify"
-+requires="unix"
- archive(byte)="inotify.cma"
- archive(native)="inotify.cmxa"
diff --git a/debian/patches/03_ocamlopt.dpatch b/debian/patches/03_ocamlopt.dpatch
deleted file mode 100755
index 34ac4bd..0000000
--- a/debian/patches/03_ocamlopt.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_ocamlopt.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add targets for byte/opt compilation.
-
- at DPATCH@
-diff -urNad ocaml-inotify~/Makefile ocaml-inotify/Makefile
---- ocaml-inotify~/Makefile	2008-06-08 16:19:48.000000000 +0200
-+++ ocaml-inotify/Makefile	2008-06-08 16:20:08.000000000 +0200
-@@ -15,6 +15,10 @@
- 
- all: $(LIBS)
- 
-+all-byte: inotify.cmi inotify.cma
-+
-+all-opt: inotify.cmi inotify.cmxa inotify.cma
-+
- bins: $(PROGRAMS)
- 
- libs: $(LIBS)
-@@ -48,6 +52,12 @@
- install: $(LIBS)
- 	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore inotify META inotify.cmi inotify.mli inotify.cma inotify.cmxa *.a *.so *.cmx
- 
-+install-byte: 
-+	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore inotify META inotify.cmi inotify.mli inotify.cma *.a *.so
-+
-+install-opt: 
-+	ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore inotify META inotify.cmi inotify.mli inotify.cma inotify.cmxa *.a *.so *.cmx
-+
- uninstall:
- 	ocamlfind remove -destdir $(OCAMLDESTDIR) sqlite3
- 

-- 
ocaml-inotify packaging