[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-1-7-gd23e600
Stephane Glondu
steph at glondu.net
Thu Feb 10 11:30:23 UTC 2011
The following commit has been merged in the master branch:
commit 5b3b31207c961143dd4558fef5c2dab28027c65b
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Feb 10 11:41:52 2011 +0100
Switch patches to quilt
diff --git a/debian/control b/debian/control
index df09e2d..9d8f25c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sylvain Le Gall <gildor at debian.org>
Build-Depends: cdbs (>= 0.4.23),
debhelper (>= 7),
- dpatch,
+ quilt (>= 0.46-7~),
ocaml-nox (>= 3.10.0-8),
liblablgtk2-ocaml-dev (>= 2.12.0-2),
chrpath,
diff --git a/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch b/debian/patches/0001-Typo-in-ignore-Regex-help.patch
old mode 100755
new mode 100644
similarity index 53%
rename from debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch
rename to debian/patches/0001-Typo-in-ignore-Regex-help.patch
index c988c04..9b2dce8
--- a/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch
+++ b/debian/patches/0001-Typo-in-ignore-Regex-help.patch
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debbug129478_strings_typo_ignore_regexp.dpatch by Lucas B. Cohen <lucas.cohen at free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Lucas B. Cohen <lucas.cohen at free.fr>
+Date: Thu, 10 Feb 2011 11:31:21 +0100
+Subject: Typo in ignore Regex help
- at DPATCH@
-diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
---- unison-2.27.57~/strings.ml 2008-01-19 16:23:01.000000000 +0100
-+++ unison-2.27.57/strings.ml 2008-04-23 02:01:31.000000000 +0200
-@@ -3722,7 +3722,7 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=129478
+---
+ strings.ml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/strings.ml b/strings.ml
+index 36861d9..1275399 100644
+--- a/strings.ml
++++ b/strings.ml
+@@ -4011,7 +4011,7 @@ let docs =
\032 changed. Instead of putting a line of the form\n\
\032 ignore = <regexp>\n\
\032 in your profile (.unison/default.prf), you should put:\n\
@@ -17,3 +20,4 @@ diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
\032 Moreover, two other styles of pattern are also recognized:\n\
\032 ignore = Name <name>\n\
\032 matches any path in which one component matches <name>, while\n\
+--
diff --git a/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch b/debian/patches/0002-Fix-obsolete-help-about-ssh.patch
old mode 100755
new mode 100644
similarity index 77%
rename from debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch
rename to debian/patches/0002-Fix-obsolete-help-about-ssh.patch
index 8ab97b4..146aedd
--- a/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch
+++ b/debian/patches/0002-Fix-obsolete-help-about-ssh.patch
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debbug137960_strings_obsolete_ssh_info.dpatch by Lucas B. Cohen <lucas.cohen at free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Lucas B. Cohen <lucas.cohen at free.fr>
+Date: Thu, 10 Feb 2011 11:33:47 +0100
+Subject: Fix obsolete help about ssh
- at DPATCH@
-diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
---- unison-2.27.57~/strings.ml 2008-01-19 16:23:01.000000000 +0100
-+++ unison-2.27.57/strings.ml 2008-04-23 01:55:58.000000000 +0200
-@@ -492,10 +492,8 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=137960
+---
+ strings.ml | 11 ++++-------
+ 1 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/strings.ml b/strings.ml
+index 1275399..b856170 100644
+--- a/strings.ml
++++ b/strings.ml
+@@ -512,10 +512,8 @@ let docs =
\n\
\032 The standard remote shell facility on Unix systems is ssh, which\n\
\032 provides the same functionality as the older rsh but much better\n\
@@ -21,7 +24,7 @@ diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
\n\
\032 Running ssh requires some coordination between the client and server\n\
\032 machines to establish that the client is allowed to invoke commands on\n\
-@@ -2425,9 +2423,8 @@
+@@ -2545,9 +2543,8 @@ let docs =
\032 and \"Add to Start Menu.\" You make the call.\n\
\032 d. You can now delete the directory Foo and its contents.\n\
\032 Some people have reported problems using Cygwin's ssh with Unison.\n\
@@ -33,3 +36,4 @@ diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
\032 2. You must set the environment variables HOME and PATH. Ssh will\n\
\032 create a directory .ssh in the directory given by HOME, so that it\n\
\032 has a place to keep data like your public and private keys. PATH\n\
+--
diff --git a/debian/patches/debbug466173_strings_typo_follw.dpatch b/debian/patches/0003-Typo-missing-o-in-follow.patch
old mode 100755
new mode 100644
similarity index 52%
rename from debian/patches/debbug466173_strings_typo_follw.dpatch
rename to debian/patches/0003-Typo-missing-o-in-follow.patch
index 4078b93..093086d
--- a/debian/patches/debbug466173_strings_typo_follw.dpatch
+++ b/debian/patches/0003-Typo-missing-o-in-follow.patch
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debbug466173_strings_typo_follw.dpatch by Lucas B. Cohen <lucas.cohen at free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Lucas B. Cohen <lucas.cohen at free.fr>
+Date: Thu, 10 Feb 2011 11:35:39 +0100
+Subject: Typo: missing o in follow
- at DPATCH@
-diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
---- unison-2.27.57~/strings.ml 2008-01-19 16:23:01.000000000 +0100
-+++ unison-2.27.57/strings.ml 2008-04-23 01:22:17.000000000 +0200
-@@ -405,7 +405,7 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466173
+---
+ strings.ml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/strings.ml b/strings.ml
+index b856170..0976703 100644
+--- a/strings.ml
++++ b/strings.ml
+@@ -425,7 +425,7 @@ let docs =
\n\
\032 indicates that the file c has been modified only in the second\n\
\032 replica, and that the default action is therefore to propagate the new\n\
@@ -17,3 +20,4 @@ diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
\032 the \"f\" at the prompt.\n\
\n\
\032 If both replicas are modified and their contents are different, then\n\
+--
diff --git a/debian/patches/0004-Fix-silent-behaviour.patch b/debian/patches/0004-Fix-silent-behaviour.patch
new file mode 100644
index 0000000..c9ea757
--- /dev/null
+++ b/debian/patches/0004-Fix-silent-behaviour.patch
@@ -0,0 +1,24 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Thu, 10 Feb 2011 11:37:46 +0100
+Subject: Fix -silent behaviour
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=497729
+---
+ uitext.ml | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/uitext.ml b/uitext.ml
+index d00fd7e..cc6a839 100644
+--- a/uitext.ml
++++ b/uitext.ml
+@@ -745,7 +745,8 @@ let start _ =
+ Uicommon.uiInit
+ (fun s -> Util.msg "%s\n%s\n" Uicommon.shortUsageMsg s; exit 1)
+ (fun s -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
+- (fun () -> if not (Prefs.read silent)
++ (fun () -> if Prefs.read silent then Prefs.set Trace.terse true;
++ if not (Prefs.read silent)
+ then Util.msg "%s\n" (Uicommon.contactingServerMsg()))
+ (fun () -> Some "default")
+ (fun () -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
+--
diff --git a/debian/patches/debbug585453_mymap.dpatch b/debian/patches/0005-Fix-build-with-OCaml-3.12.patch
old mode 100755
new mode 100644
similarity index 58%
rename from debian/patches/debbug585453_mymap.dpatch
rename to debian/patches/0005-Fix-build-with-OCaml-3.12.patch
index ccc6ba7..3a87f3f
--- a/debian/patches/debbug585453_mymap.dpatch
+++ b/debian/patches/0005-Fix-build-with-OCaml-3.12.patch
@@ -1,11 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debbug585453_mymap.dpatch by Stéphane Glondu <glondu at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix build with OCaml 3.12, where Map has been extended
-## DP: (Closes: #585453)
+From: =?UTF-8?q?St=C3=A9phane=20Glondu?= <glondu at debian.org>
+Date: Thu, 10 Feb 2011 11:38:49 +0100
+Subject: Fix build with OCaml 3.12
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585453
+---
+ update.mli | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
- at DPATCH@
diff --git a/update.mli b/update.mli
index dc1e018..c99c704 100644
--- a/update.mli
@@ -19,3 +20,4 @@ index dc1e018..c99c704 100644
type archive =
ArchiveDir of Props.t * archive NameMap.t
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7fe3215..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-debbug129478_strings_typo_ignore_regexp
-debbug137960_strings_obsolete_ssh_info
-debbug466173_strings_typo_follw
-debbug497729_silent
-debbug585453_mymap
diff --git a/debian/patches/debbug497729_silent.dpatch b/debian/patches/debbug497729_silent.dpatch
deleted file mode 100755
index d5a2a8d..0000000
--- a/debian/patches/debbug497729_silent.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debbug497729_silent.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' unison~/uitext.ml unison/uitext.ml
---- unison~/uitext.ml 2010-02-23 01:08:02.000000000 +0000
-+++ unison/uitext.ml 2010-02-23 01:09:20.455127622 +0000
-@@ -616,7 +616,8 @@
- Uicommon.uiInit
- (fun s -> Util.msg "%s\n%s\n" Uicommon.shortUsageMsg s; exit 1)
- (fun s -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
-- (fun () -> if not (Prefs.read silent)
-+ (fun () -> if Prefs.read silent then Prefs.set Trace.terse true;
-+ if not (Prefs.read silent)
- then Util.msg "%s\n" (Uicommon.contactingServerMsg()))
- (fun () -> Some "default")
- (fun () -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aa78f1f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+0001-Typo-in-ignore-Regex-help.patch
+0002-Fix-obsolete-help-about-ssh.patch
+0003-Typo-missing-o-in-follow.patch
+0004-Fix-silent-behaviour.patch
+0005-Fix-build-with-OCaml-3.12.patch
diff --git a/debian/rules b/debian/rules
index c00a36a..9687017 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@
include /usr/share/cdbs/1/rules/ocaml.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
VERSION=$(DEB_UPSTREAM_VERSION)
# version used with addversionno in unison
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches
--
unison packaging
More information about the Pkg-ocaml-maint-commits
mailing list