[Pkg-ocaml-maint-commits] [SCM] ocaml-text packaging branch, master, updated. debian/0.2-3-8-g555409f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c4c4cbd2b0cb8c51e3dfd0c8debbacfe0a88d753
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Feb 24 20:53:26 2010 +0100

    New upstream

diff --git a/debian/changelog b/debian/changelog
index e24ee5b..ab3d71d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml-text (0.2-4) UNRELEASED; urgency=low
+ocaml-text (0.3-1) UNRELEASED; urgency=low
 
+  * New upstream release
+    - remove patch (merged upstream)
+  * Switch source format to 3.0 (quilt)
   * Update watch file
 
- -- Stéphane Glondu <glondu at debian.org>  Wed, 24 Feb 2010 20:51:31 +0100
+ -- Stéphane Glondu <glondu at debian.org>  Wed, 24 Feb 2010 20:54:23 +0100
 
 ocaml-text (0.2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b478dba..89dcd2b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 7.2.11~),
- quilt (>= 0.46-7~),
  dh-ocaml (>= 0.9),
  ocaml-findlib,
  ocaml-nox (>= 3.11.1-3~)
diff --git a/debian/patches/0001-Fix-upstream-Makefile-on-non-native-architectures.patch b/debian/patches/0001-Fix-upstream-Makefile-on-non-native-architectures.patch
deleted file mode 100644
index fded8f0..0000000
--- a/debian/patches/0001-Fix-upstream-Makefile-on-non-native-architectures.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ff6b9e095a1b8cecaab868052932a68677b29fb7 Mon Sep 17 00:00:00 2001
-From: Stephane Glondu <steph at glondu.net>
-Date: Sat, 9 May 2009 12:38:41 +0200
-Subject: [PATCH] Fix upstream Makefile on non-native architectures
-
----
- Makefile |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 22992f3..1766c61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,6 +14,10 @@ NAME = text
- all:
- 	$(OC) META $(NAME).cma $(NAME).cmxa
- 
-+.PHONY: byte
-+byte:
-+	$(OC) META $(NAME).cma
-+
- .PHONY: doc
- doc:
- 	$(OC) $(NAME).docdir/index.html
-@@ -27,12 +31,12 @@ install:
- 	$(OF) install $(NAME) _build/META \
- 	  _build/src/*.mli \
- 	  _build/src/*.cmi \
--	  _build/src/*.cmx \
-+	  $(wildcard _build/src/*.cmx) \
- 	  _build/src/*.a \
- 	  _build/src/*.so \
- 	  _build/$(NAME).cma \
--	  _build/$(NAME).cmxa \
--	  _build/$(NAME).a
-+	  $(wildcard _build/$(NAME).cmxa) \
-+	  $(wildcard _build/$(NAME).a)
- 
- .PHONY: uninstall
- uninstall:
--- 
-1.6.2.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a3a75e7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-upstream-Makefile-on-non-native-architectures.patch
diff --git a/debian/rules b/debian/rules
index e2b6e0b..56b3f77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/ocaml/ocamlvars.mk
 export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 %:
-	dh --with quilt,ocaml $@
+	dh --with ocaml $@
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
ocaml-text packaging