[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.01.1-6-12-ge432a15

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit ce5e66348695481af0e7dd91faa96a11d2058492
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 7 18:31:07 2010 +0200

    Convert to 3.0 quilt format

diff --git a/debian/changelog b/debian/changelog
index 842d360..f83cc02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,11 @@ calendar (2.03-1) UNRELEASED; urgency=low
   * New upstream release.
     - Remove cmxs.dpatch (integrated upstream).
     - Remove meta.dpatch (integrated upstream).
+  * Convert to 3.0 quilt format
+    - Convert remaining patches to quilt format
+    - Remove dpatch from b-deps
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 18:21:39 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 18:29:57 +0200
 
 calendar (2.01.1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aa8890e..3a2fd4f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,9 @@ Uploaders:
  Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
  debhelper (>= 7.0.0),
- ocaml-nox (>= 3.11),
+ ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.4),
  dh-ocaml (>= 0.9.4~),
- dpatch,
  cdbs
 Standards-Version: 3.9.0
 Homepage: http://calendar.forge.ocamlcore.org/
diff --git a/debian/patches/0001-Fix-install-target.patch b/debian/patches/0001-Fix-install-target.patch
new file mode 100644
index 0000000..2a2b899
--- /dev/null
+++ b/debian/patches/0001-Fix-install-target.patch
@@ -0,0 +1,27 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Wed, 7 Jul 2010 18:27:54 +0200
+Subject: [PATCH] Fix install target
+
+---
+ Makefile.in |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1e51d37..9029b65 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -197,10 +197,12 @@ headers:
+ # Install
+ #########
+ 
++OCAML_LIB_DIR =
+ install: $(LIBS) $(CLIBS) META
+ 	@if [ "`sed -n -e 's/version = "\([0-9.+dev]*\)"/\1/p' META`" = "$(VERSION)" ]; then \
+ 	  (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\
+-	  $(CAMLFIND) install $(NAME) target/*.cm[ioxa] target/*.cmx[as] $(MLI)  $(CLIBS) META); \
++	  mkdir -p $(OCAML_LIB_DIR);\
++	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/calendarLib.cmi target/calendarLib.cma $(wildcard target/calendarLib.cmx target/calendarLib.cmxa target/calendarLib.a target/calendarLib.cmxs) $(MLI) META;) \
+ 	else \
+ 	  (echo; echo "Not the good version. Please, do :"; \
+ 	   echo "  make clean && make"; \
+-- 
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 806a429..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-install_destdir.dpatch
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
deleted file mode 100755
index d2085bc..0000000
--- a/debian/patches/install_destdir.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad calendar~/Makefile.in calendar/Makefile.in
---- calendar~/Makefile.in	2009-02-28 22:05:15.000000000 +0100
-+++ calendar/Makefile.in	2009-03-02 23:08:26.479547401 +0100
-@@ -191,10 +191,12 @@
- # Install
- #########
- 
-+OCAML_LIB_DIR =
- install: $(LIBS) $(CLIBS) META
- 	@if [ "`sed -n -e 's/version = "\([0-9.]*\)"/\1/p' META`" = "$(VERSION)" ]; then \
- 	  (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\
--	  $(CAMLFIND) install $(NAME) target/*.cm[iox] target/*.cma target/*.cmxa $(MLI) $(CMI) $(CLIBS) META\
-+	  mkdir -p $(OCAML_LIB_DIR);\
-+	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/calendarLib.cmi target/calendarLib.cma $(wildcard target/calendarLib.cmx target/calendarLib.cmxa target/calendarLib.a target/calendarLib.cmxs) $(MLI) META\
- 	)else \
- 	  (echo; echo "Not the good version. Please, do :"; \
- 	   echo "  make clean && make"; \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ebacac8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-install-target.patch
diff --git a/debian/rules b/debian/rules
index 8fe7da4..5a321cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
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)

-- 
calendar packaging