[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit 9e209b8dbf41216478dc093e4e76935a566c9e93 Author: Stephane Glondu Date: Sun Jan 8 14:14:53 2012 +0100 Update changelog and prepare upload to experimental Documentation looks broken... diff --git a/debian/changelog b/debian/changelog index 978fbbd..e0499f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ -unison (2.40.63-1) UNRELEASED; urgency=low +unison (2.40.63-1) experimental; urgency=low - * New upstream release - - -- Stéphane Glondu Sun, 08 Jan 2012 13:48:32 +0100 + * Team upload + * New upstream release (Closes: #641462) +- remove all former patches; the issues they fix seem to have been + addressed upstream +- add a new patch to fix all typos reported by Lintian + * debian/control: +- remove build-dependency to quilt +- replace Conflicts by Replaces/Breaks +- bump Standards-Version to 3.9.2 (no changes) + + -- Stéphane Glondu Sun, 08 Jan 2012 14:25:17 +0100 unison (2.32.52-3) unstable; urgency=low diff --git a/debian/clean b/debian/clean new file mode 100644 index 000..6d9c4da --- /dev/null +++ b/debian/clean @@ -0,0 +1,5 @@ +lwt/generic/lwt_unix_impl.cmi +lwt/generic/lwt_unix_impl.cmx +lwt/generic/lwt_unix_impl.o +system/generic/system_impl.o +system/system_generic.o -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch:
commit 46d9b5eabc4cfa73375508f2a78fc86697ce5dd3
Author: Stephane Glondu
Date: Sun Jan 8 14:12:44 2012 +0100
Fix typos spotted by Lintian
diff --git a/debian/patches/0001-Fix-typos-spotted-by-Lintian.patch
b/debian/patches/0001-Fix-typos-spotted-by-Lintian.patch
new file mode 100644
index 000..fec29ec
--- /dev/null
+++ b/debian/patches/0001-Fix-typos-spotted-by-Lintian.patch
@@ -0,0 +1,227 @@
+From: Stephane Glondu
+Date: Sun, 8 Jan 2012 14:12:24 +0100
+Subject: Fix typos spotted by Lintian
+
+---
+ INSTALL.win32-msvc |2 +-
+ copy.mli |2 +-
+ globals.ml |2 +-
+ osx.ml | 24
+ transfer.ml|2 +-
+ transfer.mli |4 ++--
+ transport.ml |2 +-
+ uicommon.ml|4 ++--
+ uicommon.mli |2 +-
+ 9 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/INSTALL.win32-msvc b/INSTALL.win32-msvc
+index a425a0f..6924210 100644
+--- a/INSTALL.win32-msvc
b/INSTALL.win32-msvc
+@@ -475,7 +475,7 @@ directories and files or processing names supplied by the
user:
+
+ Appendix D - Windows icons
+
+- Here are some general informations on how to make your Windows
++ Here are some general information on how to make your Windows
+ program have a nice icon.
+
+ * What we mean by icon is a set of bitmaps that are displayed by
+diff --git a/copy.mli b/copy.mli
+index 9147794..287f26d 100644
+--- a/copy.mli
b/copy.mli
+@@ -12,7 +12,7 @@ val file :
+ -> Os.fullfingerprint (* fingerprint of file *)
+ -> Fileinfo.stamp option
+ (* source file stamp, if available *)
+- -> Osx.ressStamp (* ressource info of file *)
++ -> Osx.ressStamp (* resource info of file *)
+ -> Uutil.File.t(* file's index in UI (for progress bars) *)
+ -> Fileinfo.t Lwt.t(* information regarding the transferred file *)
+
+diff --git a/globals.ml b/globals.ml
+index 02e1a87..fcb810f 100644
+--- a/globals.ml
b/globals.ml
+@@ -302,5 +302,5 @@ let fatFilesystem =
+ do not attempt to synchronize symbolic links ({\\tt links = false}); \
+ ignore inode number changes when detecting updates \
+ ({\\tt ignoreinodenumbers = true}). \
+- Any of these change can be overridden by explicitely setting \
++ Any of these change can be overridden by explicitly setting \
+ the corresponding preference in the profile.")
+diff --git a/osx.ml b/osx.ml
+index dc58b64..13e6257 100644
+--- a/osx.ml
b/osx.ml
+@@ -58,15 +58,15 @@ let init b =
+ let doubleMagic = "\000\005\022\007"
+ let doubleVersion = "\000\002\000\000"
+ let doubleFiller = String.make 16 '\000'
+-let ressource_fork_empty_tag = "This resource fork intentionally left blank
"
++let resource_fork_empty_tag = "This resource fork intentionally left blank "
+ let finfoLength = 32L
+ let emptyFinderInfo () = String.make 32 '\000'
+-let empty_ressource_fork =
++let empty_resource_fork =
+ "\000\000\001\000" ^
+ "\000\000\001\000" ^
+ "\000\000\000\000" ^
+ "\000\000\000\030" ^
+- ressource_fork_empty_tag ^
++ resource_fork_empty_tag ^
+ String.make (66+128) '\000' ^
+ "\000\000\001\000" ^
+ "\000\000\001\000" ^
+@@ -239,7 +239,7 @@ let getFileInfos dataFspath dataPath typ =
+ if not (Prefs.read rsrc) then defaultInfos typ else
+ match typ with
+ (`FILE | `DIRECTORY) as typ ->
+- Util.convertUnixErrorsToTransient "getting file informations" (fun () ->
++ Util.convertUnixErrorsToTransient "getting file information" (fun () ->
+ try
+ let (fInfo, rsrcLength) =
+ getFileInfosInternal
+@@ -260,15 +260,15 @@ let getFileInfos dataFspath dataPath typ =
+ let (rsrcOffset, rsrcLength) =
+ try
+ let (offset, len) = Safelist.assoc `RSRC entries in
+-(* We need to check that the ressource fork is not a
++(* We need to check that the resource fork is not a
+dummy one included for compatibility reasons *)
+ if len = 286L &&
+protect (fun () ->
+ LargeFile.seek_in inch (Int64.add offset 16L);
+- let len = String.length ressource_fork_empty_tag in
++ let len = String.length resource_fork_empty_tag in
+ let buf = String.create len in
+ really_input inch buf 0 len;
+- buf = ressource_fork_empty_tag)
++ buf = resource_fork_empty_tag)
+ (fun () -> close_in_noerr inch)
+ then
+ (0L, 0L)
+@@ -279,7 +279,7 @@ let getFileInfos dataFspath dataPath typ =
+ in
+ debug (fun () ->
+ Util.msg
+-"AppleDouble for file %s / %s: ressource fork length: %d\n"
++"AppleDouble for file %s / %s: resource fork le
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch:
commit 9a1fe1612a3dcedce9d27e5e7d40d539eed3a6e1
Author: Stephane Glondu
Date: Sun Jan 8 13:02:43 2012 +0100
Replace Conflicts by Replaces/Breaks
diff --git a/debian/control b/debian/control
index 472e79f..c8c5fa3 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Package: unison
Architecture: any
Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
Recommends: ssh-client | openssh-client
-Conflicts: ${F:OtherUnison}
+Replaces: ${F:OtherUnison}
+Breaks: ${F:OtherUnison}
Description: file-synchronization tool for Unix and Windows
Unison is a file-synchronization tool for Unix and Windows, written
in OCaml. It allows two replicas of a collection of files and
@@ -44,7 +45,8 @@ Description: file-synchronization tool for Unix and Windows
Package: unison-gtk
Architecture: any
Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
-Conflicts: ${F:OtherUnisonGtk}
+Replaces: ${F:OtherUnisonGtk}
+Breaks: ${F:OtherUnisonGtk}
Recommends: ssh-askpass, ssh-client | openssh-client
Description: file-synchronization tool for Unix and Windows with GTK+ interface
Unison is a file-synchronization tool for Unix and Windows, written
--
unison packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit b97ff281ed5bea3a54a5e7187ff6482634f76781 Author: Stephane Glondu Date: Sun Jan 8 13:00:21 2012 +0100 Bump Standards-Version to 3.9.2 (no changes) diff --git a/debian/control b/debian/control index 5503117..472e79f 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs (>= 0.4.23), librsvg2-bin (>= 2.18.2), imagemagick, dh-ocaml (>= 0.9.1) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/unison.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/unison.git Homepage: http://www.cis.upenn.edu/~bcpierce/unison/ -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch:
commit 031012b66aedc69622b66d3834e735cbfaa166f5
Author: Stephane Glondu
Date: Sun Jan 8 12:05:57 2012 +0100
Fix Lintian's description-synopsis-starts-with-article
diff --git a/debian/control b/debian/control
index 3f2f004..5503117 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
Recommends: ssh-client | openssh-client
Conflicts: ${F:OtherUnison}
-Description: A file-synchronization tool for Unix and Windows
+Description: file-synchronization tool for Unix and Windows
Unison is a file-synchronization tool for Unix and Windows, written
in OCaml. It allows two replicas of a collection of files and
directories to be stored on different hosts (or different disks
@@ -46,7 +46,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
Conflicts: ${F:OtherUnisonGtk}
Recommends: ssh-askpass, ssh-client | openssh-client
-Description: A file-synchronization tool for Unix and Windows with GTK+
interface
+Description: file-synchronization tool for Unix and Windows with GTK+ interface
Unison is a file-synchronization tool for Unix and Windows, written
in OCaml. It allows two replicas of a collection of files and
directories to be stored on different hosts (or different disks
--
unison packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit e0675558e6435b8ae3d65c0a7bb9144ee8163d62 Author: Stephane Glondu Date: Sun Jan 8 12:04:21 2012 +0100 Remove useless build-dependency to quilt diff --git a/debian/control b/debian/control index 9d8f25c..3f2f004 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers Uploaders: Sylvain Le Gall Build-Depends: cdbs (>= 0.4.23), debhelper (>= 7), - quilt (>= 0.46-7~), ocaml-nox (>= 3.10.0-8), liblablgtk2-ocaml-dev (>= 2.12.0-2), chrpath, diff --git a/debian/rules b/debian/rules index 6e2667e..104e509 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ include /usr/share/cdbs/1/rules/ocaml.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk VERSION=$(DEB_UPSTREAM_VERSION) # version used with addversionno in unison -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit 5544990f0a520d46beca1a636c5beaf01213f0fa Author: Stephane Glondu Date: Sun Jan 8 12:38:11 2012 +0100 Remove generated files diff --git a/debian/rules b/debian/rules index 9687017..6e2667e 100755 --- a/debian/rules +++ b/debian/rules @@ -90,17 +90,8 @@ DEB_INSTALL_CHANGELOGS_ALL := NEWS # Build unison # -BACKUP=lwt/depend ubase/depend configure:: cp config/Makefile.unix config/Makefile - for i in $(BACKUP); do \ - if ! test -e $$i.org; then cp $$i $$i.org; fi; \ - done - -clean:: - for i in $(BACKUP); do \ - if test -e $$i.org; then mv $$i.org $$i; fi; \ - done build/$(UNISON_PACKAGE):: $(MAKE) UISTYLE=text NATIVE=$(NATIVE) $(MY_MAKE_FLAGS) CFLAGS= @@ -115,6 +106,7 @@ clean:: -$(RM) '$(CURDIR)/$(UNISON_GTK)' -$(RM) '$(CURDIR)/$(UNISON)' $(MAKE) clean + rm lwt/depend ubase/depend debian/unison-manual.txt: build/$(UNISON_PACKAGE) env HOME='$(CURDIR)' '$(CURDIR)/$(UNISON)' -doc all > '$(CURDIR)/unison-manual.txt' diff --git a/lwt/depend b/lwt/depend deleted file mode 100644 index c73c3a2..000 --- a/lwt/depend +++ /dev/null @@ -1,12 +0,0 @@ -lwt.cmo: lwt.cmi -lwt.cmx: lwt.cmi -lwt_unix.cmo: lwt_unix.cmi -lwt_unix.cmx: lwt_unix.cmi -lwt_util.cmo: lwt.cmi lwt_util.cmi -lwt_util.cmx: lwt.cmx lwt_util.cmi -pqueue.cmo: pqueue.cmi -pqueue.cmx: pqueue.cmi -lwt.cmi: -lwt_unix.cmi: lwt.cmi -lwt_util.cmi: lwt.cmi -pqueue.cmi: diff --git a/ubase/depend b/ubase/depend deleted file mode 100644 index 5f5967a..000 --- a/ubase/depend +++ /dev/null @@ -1,27 +0,0 @@ -myMap.cmo: myMap.cmi -myMap.cmx: myMap.cmi -prefs.cmo: util.cmi uarg.cmi safelist.cmi prefs.cmi -prefs.cmx: util.cmx uarg.cmx safelist.cmx prefs.cmi -proplist.cmo: util.cmi proplist.cmi -proplist.cmx: util.cmx proplist.cmi -rx.cmo: rx.cmi -rx.cmx: rx.cmi -safelist.cmo: safelist.cmi -safelist.cmx: safelist.cmi -trace.cmo: util.cmi safelist.cmi prefs.cmi trace.cmi -trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi -uarg.cmo: util.cmi safelist.cmi uarg.cmi -uarg.cmx: util.cmx safelist.cmx uarg.cmi -uprintf.cmo: uprintf.cmi -uprintf.cmx: uprintf.cmi -util.cmo: uprintf.cmi safelist.cmi util.cmi -util.cmx: uprintf.cmx safelist.cmx util.cmi -myMap.cmi: -prefs.cmi: util.cmi -proplist.cmi: -rx.cmi: -safelist.cmi: -trace.cmi: prefs.cmi -uarg.cmi: -uprintf.cmi: -util.cmi: -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit 8ed98547d772598cd534dfef302e77cee6c0601b Author: Stephane Glondu Date: Sun Jan 8 13:57:09 2012 +0100 Remove all patches It looks like all the issues they fix have been addressed upstream. diff --git a/debian/patches/0001-Typo-in-ignore-Regex-help.patch b/debian/patches/0001-Typo-in-ignore-Regex-help.patch deleted file mode 100644 index 9b2dce8..000 --- a/debian/patches/0001-Typo-in-ignore-Regex-help.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Lucas B. Cohen -Date: Thu, 10 Feb 2011 11:31:21 +0100 -Subject: Typo in ignore Regex help - -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\ - \032ignore = \n\ - \032 in your profile (.unison/default.prf), you should put:\n\ -- \032ignore = Regexp \n\ -+ \032ignore = Regex \n\ - \032 Moreover, two other styles of pattern are also recognized:\n\ - \032ignore = Name \n\ - \032 matches any path in which one component matches , while\n\ --- diff --git a/debian/patches/0002-Fix-obsolete-help-about-ssh.patch b/debian/patches/0002-Fix-obsolete-help-about-ssh.patch deleted file mode 100644 index 146aedd..000 --- a/debian/patches/0002-Fix-obsolete-help-about-ssh.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Lucas B. Cohen -Date: Thu, 10 Feb 2011 11:33:47 +0100 -Subject: Fix obsolete help about ssh - -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\ -- \032 security. Ssh is available from ftp://ftp.cs.hut.fi/pub/ssh/;\n\ -- \032 up-to-date binaries for some architectures can also be found at\n\ -- \032 ftp://ftp.faqs.org/ssh/contrib. See section [1]A.2 for installation\n\ -- \032 instructions for the Windows version.\n\ -+ \032 security. Ssh is available from http://www.openssh.org/; See section [1]\n\ -+ \032 A.2 for installation instructions for the Windows version.\n\ - \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\ -@@ -2545,9 +2543,8 @@ let docs = - \032 and \"Add to Start Menu.\" You make the call.\n\ - \032d. You can now delete the directory Foo and its contents.\n\ - \032 Some people have reported problems using Cygwin's ssh with Unison.\n\ -- \032 If you have trouble, you might try this one instead:\n\ -- \032 http://opensores.thebunker.net/pub/mirrors/ssh/contrib/ssh-1.2.14-win32bin.zi\n\ -- p\n\ -+ \032 If you have trouble, you might try other ones instead:\n\ -+ \032 http://linuxmafia.com/ssh/win32.html\n\ - \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/0003-Typo-missing-o-in-follow.patch b/debian/patches/0003-Typo-missing-o-in-follow.patch deleted file mode 100644 index 093086d..000 --- a/debian/patches/0003-Typo-missing-o-in-follow.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Lucas B. Cohen -Date: Thu, 10 Feb 2011 11:35:39 +0100 -Subject: Typo: missing o in follow - -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\ -- \032 version to the first replica. To follw Unison's recommendation, press\n\ -+ \032 version to the first replica. To follow Unison's recommendation, press\n\ - \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-beha
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit 34f530e00ffad17137122d45cd093d734553107c Author: Stephane Glondu Date: Sun Jan 8 13:48:58 2012 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index d308d4f..978fbbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +unison (2.40.63-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Sun, 08 Jan 2012 13:48:32 +0100 + unison (2.32.52-3) unstable; urgency=low * Team upload -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8
The following commit has been merged in the master branch: commit 3a8eab4f96038cd5f58a05262e702839da931bce Merge: 343234196034af3c14c661545ea173b2b102febc fa150f9cd75fbe928e47eb8ac2d8c2410c850af3 Author: Stephane Glondu Date: Sun Jan 8 13:48:25 2012 +0100 Merge commit 'upstream/2.40.63' -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
