[Pkg-ocaml-maint-commits] [xstr] 04/08: Switch source package format to 3.0 (quilt)

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository xstr.

commit 22250490bde5fbd29de8dfeed4aa3304ebcf74b2
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 8 17:42:34 2017 +0200

    Switch source package format to 3.0 (quilt)
---
 debian/control                                     |  3 +--
 ...lling-to-a-target-directory-passed-from-.patch} | 24 ++++++++++++----------
 debian/patches/00dpatch.conf                       |  2 --
 debian/patches/00list                              |  1 -
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 -
 debian/source/format                               |  1 +
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 58d3b99..b866c3e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Build-Depends:
  ocaml-nox (>= 3.11),
  ocaml-findlib (>= 1.2.4),
  cdbs,
- dh-ocaml (>= 0.9.1),
- dpatch
+ dh-ocaml (>= 0.9.1)
 Standards-Version: 3.8.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/xstr.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/xstr.git
diff --git a/debian/patches/build.dpatch b/debian/patches/0001-Enable-installing-to-a-target-directory-passed-from-.patch
old mode 100755
new mode 100644
similarity index 50%
rename from debian/patches/build.dpatch
rename to debian/patches/0001-Enable-installing-to-a-target-directory-passed-from-.patch
index a59246b..5e3d9c3
--- a/debian/patches/build.dpatch
+++ b/debian/patches/0001-Enable-installing-to-a-target-directory-passed-from-.patch
@@ -1,14 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_build.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enable installing to a target directory passed from debian/rules
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 8 Aug 2017 17:40:35 +0200
+Subject: Enable installing to a target directory passed from debian/rules
 
- at DPATCH@
-diff -urNad xstr~/Makefile xstr/Makefile
---- xstr~/Makefile	2009-02-26 23:07:16.000000000 +0100
-+++ xstr/Makefile	2009-02-26 23:08:40.321976359 +0100
-@@ -17,6 +17,7 @@
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c32be1b..cea4e61 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,7 @@ XARCHIVE = xstr.cmxa
  NAME     = xstr
  #REQUIRES =
  UNSAFE   =
@@ -16,7 +18,7 @@ diff -urNad xstr~/Makefile xstr/Makefile
  
  # you may try this: (0% to 10% faster)
  #UNSAFE   = -unsafe
-@@ -48,8 +49,9 @@
+@@ -48,8 +49,9 @@ depend: *.ml *.mli
  
  .PHONY: install
  install: all
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 9f6dd28..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-build.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..32678e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Enable-installing-to-a-target-directory-passed-from-.patch
diff --git a/debian/rules b/debian/rules
index 5592a8b..39c275e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 PKGNAME = libxstr-ocaml-dev
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAML_STDLIB_DIR)
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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/xstr.git