--- unison-2.32.52.orig/debian/unison-gtk.desktop.in +++ unison-2.32.52/debian/unison-gtk.desktop.in @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Unison +Comment=GTK interface for the unison file synchronization tool @VERSION@ +GenericName=File synchronization tool +Exec=@UNISON_GTK@ +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=/usr/share/pixmaps/@UNISON_GTK_PACKAGE@.svg +Categories=Utility;FileTools;GTK; +StartupWMClass=Unison-gtk +StartupNotify=true --- unison-2.32.52.orig/debian/generate-manpage.ml +++ unison-2.32.52/debian/generate-manpage.ml @@ -0,0 +1,116 @@ + +#load "str.cma" + +let option_no_arg opt hlp = + List.iter print_endline + [ + ".TP"; + ".B \\"^opt; + hlp + ] + +let option_arg opt arg hlp = + List.iter print_endline + [ + ".TP"; + ".B \\"^opt^" "^arg; + hlp + ] + +let () = + let fn = + Filename.temp_file "unison-" ".txt" + in + begin + try + let cmd = + (String.concat " " (List.tl (Array.to_list Sys.argv)))^ + " -help > "^ + (Filename.quote fn) + in + match Sys.command cmd with + | 2 -> + begin + let actions = + (* *) + (List.map + (fun (s, f) -> Str.regexp s, f) + [ + " *\\(-[a-z_-]+\\) xxx +\\(.*\\)", + (fun s -> + option_arg + (Str.matched_group 1 s) + "xxx" + (Str.matched_group 2 s)); + + " *\\(-[a-z_-]+\\) n +\\(.*\\)", + (fun s -> + option_arg + (Str.matched_group 1 s) + "n" + (Str.matched_group 2 s)); + + " *\\(-[a-z_-]+\\) +\\(.*\\)", + (fun s -> + option_no_arg + (Str.matched_group 1 s) + (Str.matched_group 2 s)); + ]) + @ + (List.map + (fun s -> Str.regexp s, ignore) + [ + "Advanced options:"; + "Basic options:"; + "Usage: unison \\[options\\]"; + " *or unison root1 root2 \\[options\\]"; + " *or unison profilename \\[options\\]"; + "^$"; + ]) + in + let chn = + open_in fn + in + begin + try + while true do + let line = + input_line chn + in + try + let (r, a) = + List.find + (fun (r, a) -> + Str.string_match r line 0) + actions + in + let _b : bool = + (* Ensure that we run string_match just + before calling a, to fill the good + variable in Str + *) + Str.string_match r line 0 + in + a line + + with Not_found -> + failwith + (Printf.sprintf + "No matching regexp for '%s'" + line) + done + with End_of_file -> + () + end; + close_in chn + end + | n -> + Printf.eprintf "Command '%s' exited with code %d" + cmd + n + with e -> + Sys.remove fn; + raise e + end; + Sys.remove fn + --- unison-2.32.52.orig/debian/unison-gtk.install.in +++ unison-2.32.52/debian/unison-gtk.install.in @@ -0,0 +1,5 @@ +debian/@UNISON_GTK_PACKAGE@.xpm /usr/share/pixmaps/ +debian/@UNISON_GTK_PACKAGE@.svg /usr/share/pixmaps/ +@UNISON_GTK@ /usr/bin/ +debian/@UNISON_GTK_PACKAGE@.desktop /usr/share/applications/ +debian/@UNISON_GTK_PACKAGE@.completion.bash /etc/bash_completion.d/@UNISON_GTK_PACKAGE@ --- unison-2.32.52.orig/debian/control +++ unison-2.32.52/debian/control @@ -0,0 +1,71 @@ +Source: unison +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OCaml Maintainers +Uploaders: Sylvain Le Gall +Build-Depends: cdbs (>= 0.4.23), + debhelper (>= 7), + dpatch, + ocaml-nox (>= 3.10.0-8), + liblablgtk2-ocaml-dev (>= 2.12.0-2), + chrpath, + librsvg2-bin (>= 2.18.2), + imagemagick, + dh-ocaml (>= 0.9.1) +Standards-Version: 3.8.4 +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/ + +Package: unison +Architecture: any +Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends} +Recommends: ssh-client | openssh-client +Conflicts: ${F:OtherUnison}, unison (<< 2.9.1-3) +Description: A 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 + on the same host), modified separately, and then brought up to + date by propagating the changes in each replica to the other. + . + Unison offers several advantages over various synchronization methods + such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and + synchronize between Windows and many UNIX platforms. Unison requires + no root privileges, system access or kernel changes to function. Unison + can synchronize changes to files and directories in both directions, + on the same machine, or across a network using ssh or a direct + socket connection. + . + Transfers are optimised using a version of the rsync protocol, + making it ideal for slower links. Unison has a clear and precise + specification, and is resilient to failure due to its careful + handling of the replicas and its private structures. + +Package: unison-gtk +Architecture: any +Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends} +Conflicts: ${F:OtherUnisonGtk}, unison-gtk (<< 2.9.1-3) +Recommends: ssh-askpass, ssh-client | openssh-client +Description: A 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 + on the same host), modified separately, and then brought up to + date by propagating the changes in each replica to the other. + . + Unison offers several advantages over various synchronization methods + such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and + synchronize between Windows and many UNIX platforms. Unison requires + no root privileges, system access or kernel changes to function. Unison + can synchronize changes to files and directories in both directions, + on the same machine, or across a network using ssh or a direct + socket connection. + . + Transfers are optimised using a version of the rsync protocol, + making it ideal for slower links. Unison has a clear and precise + specification, and is resilient to failure due to its careful + handling of the replicas and its private structures. + . + This package adds the optional GTK+ interface. --- unison-2.32.52.orig/debian/unison-outro.1.in +++ unison-2.32.52/debian/unison-outro.1.in @@ -0,0 +1,12 @@ +.PP +Some preferences are just boolean flags. Others take numeric or string +arguments, indicated in the preferences list by n or xxx. Most of the +string preferences can be given several times; the arguments are +accumulated into a list internally. +.SH SEE ALSO +The program is documented fully in the in-built documentation and the +manual, available as text in /usr/share/doc/@UNISON_PACKAGE@/. +.SH AUTHOR +Options are automatically extracted from `unison -help'. The rest of this +manual page was written by Robert McQueen , for the Debian +GNU/Linux system (but may be used by others). --- unison-2.32.52.orig/debian/gbp.conf +++ unison-2.32.52/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- unison-2.32.52.orig/debian/compat +++ unison-2.32.52/debian/compat @@ -0,0 +1 @@ +7 --- unison-2.32.52.orig/debian/unison-gtk.menu.in +++ unison-2.32.52/debian/unison-gtk.menu.in @@ -0,0 +1,4 @@ +?package(@UNISON_GTK_PACKAGE@):needs="x11" section="Applications/File Management" \ + title="Unison @VERSION@ (GTK)" command="/usr/bin/@UNISON_GTK@" \ + longtitle="Unison @VERSION@ file synchronizer (GTK interface)" \ + icon="/usr/share/pixmaps/@UNISON_GTK_PACKAGE@.xpm" --- unison-2.32.52.orig/debian/rules +++ unison-2.32.52/debian/rules @@ -0,0 +1,246 @@ +#!/usr/bin/make -f +# debian/rules for unison package +# Copyright (C) 2006-2009 Sylvain Le Gall +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +# MA 02110-1301, USA. + +include /usr/share/cdbs/1/rules/ocaml.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk + +VERSION=$(DEB_UPSTREAM_VERSION) +# version used with addversionno in unison +VERSIONNO=$(shell echo $(VERSION) | cut -f 1-2 -d .) + +ifeq ($(DEB_SOURCE_PACKAGE),unison) +# latest package +PACKAGE_VERSION= +PRIORITY=20 +# unison-gtk can replaced unison +PRIORITY_GTK=15 +else +# compatibility package +PACKAGE_VERSION=$(VERSION) +PRIORITY=10 +PRIORITY_GTK=5 +endif + +TR=$(subst .,_,$(subst -,_,$1)) + +UNISON=unison-$(VERSION) +UNISON_MAJ=UNISON-$(VERSION) +UNISON_PACKAGE=unison$(PACKAGE_VERSION) +UNISON_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON),unison-latest-stable) +UNISON_VERSIONNO=unison-$(VERSIONNO) +UNISON_VAR=$(call TR,$(UNISON)) + +UNISON_GTK=unison-$(VERSION)-gtk +UNISON_GTK_PACKAGE=$(UNISON_PACKAGE)-gtk +UNISON_GTK_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_GTK),unison-latest-stable-gtk) +UNISON_GTK_VERSIONNO=unison-$(VERSIONNO)-gtk +UNISON_GTK_VAR=$(call TR,$(UNISON_GTK)) + +RENAME := debian/unison.1.in +RENAME += debian/unison.doc-base.in +RENAME += debian/unison-gtk.menu.in +RENAME += debian/unison-gtk.svg.in +RENAME += debian/unison-gtk.install.in +RENAME += debian/unison.install.in +RENAME += debian/unison-gtk.desktop.in + +ifeq ($(DEB_SOURCE_PACKAGE),unison) +OTHER_UNISON_PACKAGE=unison$(VERSION) +OTHER_UNISON_GTK_PACKAGE=unison$(VERSION)-gtk +else +OTHER_UNISON_PACKAGE=unison (<< $(VERSION)-999) +OTHER_UNISON_GTK_PACKAGE=unison-gtk (<< $(VERSION)-999) +endif +DEB_DH_GENCONTROL_ARGS += -- "-VF:OtherUnisonGtk=$(OTHER_UNISON_GTK_PACKAGE)" "-VF:OtherUnison=$(OTHER_UNISON_PACKAGE)" + + +MY_MAKE_FLAGS += $(shell if test -x /usr/bin/ocamlopt.opt; then echo "OCAMLOPT=ocamlopt.opt"; fi ) + +ifeq ($(OCAML_HAVE_OCAMLOPT),yes) + NATIVE := true +else + NATIVE := false + DEB_STRIP_EXCLUDE := $(UNISON) $(UNISON_GTK) +endif + +UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2) + +DEB_INSTALL_DOCS_ALL := BUGS.txt TODO.txt unison-manual.txt -X unison.doc-base.in + +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= + mv '$(CURDIR)/unison' '$(CURDIR)/$(UNISON)' + +build/$(UNISON_GTK_PACKAGE):: debian/$(UNISON_GTK_PACKAGE).xpm + $(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE) $(MY_MAKE_FLAGS) CFLAGS= + mv '$(CURDIR)/unison' '$(CURDIR)/$(UNISON_GTK)' + if test 'x$(OCAML_HAVE_OCAMLOPT)' = 'xyes'; then /usr/bin/chrpath -d '$(CURDIR)/$(UNISON_GTK)'; fi + +clean:: + -$(RM) '$(CURDIR)/$(UNISON_GTK)' + -$(RM) '$(CURDIR)/$(UNISON)' + $(MAKE) clean + +debian/unison-manual.txt: build/$(UNISON_PACKAGE) + env HOME='$(CURDIR)' '$(CURDIR)/$(UNISON)' -doc all > '$(CURDIR)/unison-manual.txt' + +debian/unison.1.in: build/$(UNISON_PACKAGE) + cp debian/unison-intro.1.in debian/unison.1.in + env HOME='$(CURDIR)' ocaml debian/generate-manpage.ml '$(CURDIR)/$(UNISON)' >> debian/unison.1.in + cat debian/unison-outro.1.in >> debian/unison.1.in + +clean:: + -$(RM) unison-manual.txt + -$(RM) debian/unison.1.in + +common-binary-arch:: debian/unison-manual.txt debian/unison.1.in + +# +# Unison icons +# + +debian/$(UNISON_GTK_PACKAGE).png: debian/unison-gtk.svg.in + rsvg -f png -w 32 -h 32 $^ $@ + +debian/$(UNISON_GTK_PACKAGE).xpm: debian/$(UNISON_GTK_PACKAGE).png + convert $^ $@ + +clean:: + -$(RM) '$(CURDIR)/debian/$(UNISON_GTK_PACKAGE).png' + -$(RM) '$(CURDIR)/debian/$(UNISON_GTK_PACKAGE).xpm' + +# +# Generate debhelper files using templates +# + +SED_REPLACE += -e "s/@VERSION@/$(VERSION)/g" +SED_REPLACE += -e "s/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g" + +SED_REPLACE += -e "s/@PRIORITY@/$(PRIORITY)/g" +SED_REPLACE += -e "s/@UNISON@/$(UNISON)/g" +SED_REPLACE += -e "s/@UNISON_PACKAGE@/$(UNISON_PACKAGE)/g" +SED_REPLACE += -e "s/@UNISON_ALTERNATIVE@/$(UNISON_ALTERNATIVE)/g" +SED_REPLACE += -e "s/@UNISON_VERSIONNO@/$(UNISON_VERSIONNO)/g" +SED_REPLACE += -e "s/@UNISON_VAR@/$(UNISON_VAR)/g" +SED_REPLACE += -e "s/@UNISON_MAJ@/$(UNISON_MAJ)/g" + +SED_REPLACE += -e "s/@PRIORITY_GTK@/$(PRIORITY_GTK)/g" +SED_REPLACE += -e "s/@UNISON_GTK@/$(UNISON_GTK)/g" +SED_REPLACE += -e "s/@UNISON_GTK_PACKAGE@/$(UNISON_GTK_PACKAGE)/g" +SED_REPLACE += -e "s/@UNISON_GTK_ALTERNATIVE@/$(UNISON_GTK_ALTERNATIVE)/g" +SED_REPLACE += -e "s/@UNISON_GTK_VERSIONNO@/$(UNISON_GTK_VERSIONNO)/g" +SED_REPLACE += -e "s/@UNISON_GTK_VAR@/$(UNISON_GTK_VAR)/g" + +SED_REPLACE += -e "s/@PRIORITY_SELF@/$(PRIORITY_SELF)/g" +SED_REPLACE += -e "s/@UNISON_SELF@/$(UNISON_SELF)/g" +SED_REPLACE += -e "s/@UNISON_SELF_PACKAGE@/$(UNISON_SELF_PACKAGE)/g" +SED_REPLACE += -e "s/@UNISON_SELF_ALTERNATIVE@/$(UNISON_SELF_ALTERNATIVE)/g" +SED_REPLACE += -e "s/@UNISON_SELF_VERSIONNO@/$(UNISON_SELF_VERSIONNO)/g" +SED_REPLACE += -e "s/@UNISON_SELF_VAR@/$(UNISON_SELF_VAR)/g" +SED_REPLACE += -e "s/@IS_GTK@/$(IS_GTK)/g" + +%-template-stamp: $(wildcard debian/templates/*) + for i in $^ ; do \ + sed $(SED_REPLACE) $$i > debian/$(UNISON_SELF_PACKAGE).$$(basename $$i); \ + done; + touch $@ + +clean:: + for i in $(wildcard debian/templates/*); do \ + $(RM) -f debian/$(UNISON_GTK_PACKAGE).$$(basename $$i); \ + $(RM) -f debian/$(UNISON_PACKAGE).$$(basename $$i); \ + done + -$(RM) unison-gtk-template-stamp unison-template-stamp + +unison-gtk-template-stamp: PRIORITY_SELF = $(PRIORITY_GTK) +unison-gtk-template-stamp: UNISON_SELF = $(UNISON_GTK) +unison-gtk-template-stamp: UNISON_SELF_PACKAGE = $(UNISON_GTK_PACKAGE) +unison-gtk-template-stamp: UNISON_SELF_ALTERNATIVE = $(UNISON_GTK_ALTERNATIVE) +unison-gtk-template-stamp: UNISON_SELF_VERSIONNO = $(UNISON_GTK_VERSIONNO) +unison-gtk-template-stamp: UNISON_SELF_VAR = $(UNISON_GTK_VAR) +unison-gtk-template-stamp: IS_GTK=true + +unison-template-stamp: PRIORITY_SELF = $(PRIORITY) +unison-template-stamp: UNISON_SELF = $(UNISON) +unison-template-stamp: UNISON_SELF_PACKAGE = $(UNISON_PACKAGE) +unison-template-stamp: UNISON_SELF_ALTERNATIVE = $(UNISON_ALTERNATIVE) +unison-template-stamp: UNISON_SELF_VERSIONNO = $(UNISON_VERSIONNO) +unison-template-stamp: UNISON_SELF_VAR = $(UNISON_VAR) +unison-template-stamp: IS_GTK=false + +template: unison-template-stamp unison-gtk-template-stamp + +.PHONY: template + +common-binary-indep:: template +common-binary-arch:: template + +# +# Rename and substitute files +# + +unison-rename: unison-rename-stamp +unison-rename-stamp: $(RENAME) + # Rename all the debhelper files needed and substitue the @XXX@ + # string + for i in $^ ; do \ + DST=`echo $$i | sed -e "s/unison/${UNISON_PACKAGE}/" -e "s/\\.in\\$$//"`; \ + sed $(SED_REPLACE) $$i > "$(CURDIR)/$$DST"; \ + done + + # We always need to rename the manual + cp '$(CURDIR)/debian/$(UNISON_PACKAGE).1' '$(CURDIR)/debian/$(UNISON).1' + # We copy unison.1 to unison-gtk.1 + cp '$(CURDIR)/debian/$(UNISON).1' '$(CURDIR)/debian/$(UNISON_GTK).1' + + touch $@ + +clean:: + # Remove the renamed files + -for i in $(RENAME); do \ + DST=`echo $$i | sed -e "s/unison/${UNISON_PACKAGE}/" -e "s/\\.in\\$$//"`; \ + $(RM) "$(CURDIR)/$$DST"; \ + done + -$(RM) '$(CURDIR)/debian/$(UNISON).1' + -$(RM) '$(CURDIR)/debian/$(UNISON_GTK).1' + -$(RM) '$(CURDIR)/unison-rename-stamp' + +.PHONY: unison-rename + +common-binary-indep:: unison-rename template +common-binary-arch:: unison-rename template --- unison-2.32.52.orig/debian/copyright +++ unison-2.32.52/debian/copyright @@ -0,0 +1,31 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Author: Benjamin Pierce +Packaged-By: Robert McQueen +Packaged-Date: Fri, 10 Nov 2000 23:12:02 +0000 +Original-Source-Location: http://www.cis.upenn.edu/~bcpierce/unison/download/stable/ + +Files: * +Copyright: (C) 200-2009 Benjamin Pierce et al +License: GPL-2+ + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of +the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + +Files: debian/* +Copyright: (C) 2006-2009 Sylvain Le Gall +License: GPL-2+ + +Files: debian/unison-gtk.svg +Copyright: (C) 2007 Eric Lavarde +License: GPL-2+ + --- unison-2.32.52.orig/debian/unison-intro.1.in +++ unison-2.32.52/debian/unison-intro.1.in @@ -0,0 +1,68 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH @UNISON_MAJ@ 1 "September 23, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +@UNISON@ \- a file-synchronization tool for Unix and Windows +.SH SYNOPSIS +.B @UNISON@ +.RI [ options ] +.br +.B @UNISON@ +root1 root2 +.RI [ options ] +.br +.B @UNISON@ +profilename +.RI [ options ] +.br +.B @UNISON@-gtk +.RI [ options ] +.SH DESCRIPTION +This manual page briefly documents Unison, and was written for the +Debian GNU/Linux distribution because the original program does not +have a manual page. For a full description, please refer to the +inbuilt documentation or the manuals in /usr/share/doc/@UNISON_PACKAGE@/. The +@UNISON_GTK@ binary has similar command-line options, but allows the user +to select and create profiles and configure options from within the +program. +.PP +Unison is a file-synchronization tool for Unix and Windows. It allows +two replicas of a collection of files and directories to be stored on +different hosts (or different disks on the same host), modified +separately, and then brought up to date by propagating the changes in +each replica to the other. +.PP +Unison offers several advantages over various synchronization methods +such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and +synchronize between Windows and many UNIX platforms. Unison requires +no root privileges, system access or kernel changes to function. Unison +can synchronize changes to files and directories in both directions, +on the same machine, or across a network using ssh or a direct +socket connection. +.PP +Transfers are optimised using a version of the rsync protocol, making +it ideal for slower links. Unison has a clear and precise specification, +and is resilient to failure due to its careful handling of the replicas +and its private structures. +.PP +The two roots can be specified using an URI or a path. The URI must follow the +convention: protocol://[user@][host][:port][/path]. The protocol part can be +file, socket, ssh or rsh. +.SH OPTIONS +All Unison options are long, starting with one dash (`-') only. +A summary of options is included here. For a complete description, +see the inbuilt documentation or the manuals in /usr/share/doc/@UNISON_PACKAGE@/. --- unison-2.32.52.orig/debian/unison.doc-base.in +++ unison-2.32.52/debian/unison.doc-base.in @@ -0,0 +1,13 @@ +Document: @UNISON_PACKAGE@-manual +Title: Unison @VERSION@ Installation and Usage Manual +Author: Benjamin Pierce +Abstract: Unison is a file-synchronization tool for Unix and + Windows. It allows two replicas of a collection of files and + directories to be stored on different hosts (or different + disks on the same host), modified separately, and then brought + up to date by propagating the changes in each replica to the + other. This manual describes how to install and use Unison. +Section: File Management + +Format: text +Files: /usr/share/doc/@UNISON_PACKAGE@/unison-manual.txt.gz --- unison-2.32.52.orig/debian/README.source +++ unison-2.32.52/debian/README.source @@ -0,0 +1,5 @@ +This package use dpatch for patching the source. + +Please consider reading dpatch manpage to patch the source. + + -- Sylvain Le Gall Sun, 22 Jun 2008 23:26:52 +0200 --- unison-2.32.52.orig/debian/unison-gtk.svg.in +++ unison-2.32.52/debian/unison-gtk.svg.in @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + image/svg+xml + + Unison Logo + 2007-05-01 + + + Eric Lavarde + + + + + Benjamin C. Pierce, Jérôme Vouillon, S. Balasubramaniam + + + The U with arrow ends and yellow/red gradient from Unison + The Unison File Synchronizer Project or any packaging effort of Unison offering free access to the package sources + http://www.cis.upenn.edu/~bcpierce/unison/Unison.gif + + + The Unison File Synchronizer Project + + + N/A + + + Unison + Synchronizer + Logo + + + + + + Eric Lavarde + + + http://eric.lavar.de/comp/unison/Unison.svg + http://eric.lavar.de/comp/unison/Unison.svg + + + + + + + + + + + + + + + --- unison-2.32.52.orig/debian/README.Debian +++ unison-2.32.52/debian/README.Debian @@ -0,0 +1,161 @@ +#---------------# +# Documentation # +#---------------# + +Documentation for Unison is in the manual, which is available in +text formats in /usr/share/doc/unison. The same documentation +can also be accessed over the command line, and you can list the +available topics by executing 'unison -doc topics'. Of +particular interest for new users is the tutorial at +'unison -doc tutorial'. + +The most common usage of this package is to use ssh to connect +to the remote host via to synchronise files. The 'Install' +section of the manual details how to set up ssh with a key +file and authentication agent to avoid repeatedly entering +passwords or pass-phrases. Assuming your key file remains +private, this is a more secure authentication method than +passwords. + +The GTK+ interface for Unison is now available separately in +the unison-gtk package. + + -- Robert McQueen Wed, 29 Aug 2001 21:18:29 +0100 + +#------------------------# +# Unison and UnisonX.Y.Z # +#------------------------# + +This package has been split when Unison 2.10.2 was released. +There is now many versions of the package : +- unison, unison-gtk (version 2.27) +- unison2.27.57, unison2.27.57-gtk (version 2.27.57) +- unison2.13.16, unison2.13.16-gtk (version 2.13.16) +- unison2.9.1, unison2.9.1-gtk (version 2.9.1) + +The reason for this split is to preserve protocol compatibility with actual +stable release of debian (e.g. Woody or Sarge or Etch). By this way, you can +install unison and synchronise testing/unstable systems or install unison2.9.1 +and synchronise testing/unstable with stable systems. + +You can install both unison and unisonX.Y.Z, an alternative system is used (see +"man update-alternatives"). + +When the stable release will contain unison 2.10.2, unison2.9.1 will be +removed. When a new stable release of unison will come (for example unison +2.11.0) a package unison2.10.2 will be created to be able to synchronise with +the future stable release of debian. The package unison will then hold the +latest release of Unison (e.g. 2.11.0). + +By this way, you should always be able to synchronise stable/testing/unstable +system using unison (the good version of unison). + +This scheme continue to apply further (unison 2.13.16 was released in unison +package and unison2.9.1 was keep in Etch/Sid while Sarge was stable). + +Etch has been released with unison 2.13.16, so unison2.9.1 has been removed. +Lenny has been released with unison 2.27.57, so unison2.13.16 has been removed. + + -- Sylvain Le Gall Mon, 25 Apr 2005 23:06:44 +0200 + +#-------------# +# ssh-askpass # +#-------------# + +Ssh-askpass is a recommended package when using unison-gtk. The reason +for this is that if you use SSH access and that the key for this specific +SSH login is password protected and that you don't have added it to your +ssh-agent, you should be asked for a password in console mode. If unison +was launched from menu, you won't be aware of this and the command will +fail without explanation. The problem will be the same for simple password +access. So it is strongly recommended to install ssh-askpass if you want +to use SSH access. + +However, it is not a dependency, because there is no obvious call to +ssh-askpass in the unison source. Moreover, using SSH is not mandatory for +unison, ssh is only a "recommends" for unison and not a "depends". + + -- Sylvain Le Gall Mon, 9 May 2005 00:47:47 +0200 + +#-----------------# +# removable media # +#-----------------# + +Using unison with removable media is not safe. If you run unison in batch mode +with one of the replica on a removable media and if the media get disconnected +during the operation unison will consider that most files of one replica has +just been deleted and will delete the file of the other replica since it is +running in batch mode. + +This happens if you run in batch mode. If you are not running in batch you +should notice that unison propose to delete a lot of files! + +As usual: keep an eye of what is proposed by unison! This is one of the reason +why unison keep asking you what you really want to do. + + -- Sylvain Le Gall Thu, 15 Feb 2007 22:12:48 +0100 + +#----------------------# +# unison-latest-stable # +#----------------------# + +The package unison provide a link to the latest stable version of unison. This +link is here to help people not asking themselves what is the latest stable +version of unison. + +In package provided for compatibility reason (unison2.9.1 for example) such a link +doesn't exists. + +If you use unison-latest-stable, you are sure to use the most up-to-date stable +version of unison. + +Moreover, using a constant name help "update-alternatives" not to get lost when +upgrading the package from major version to major version (when the version +of unison change). + + -- Sylvain Le Gall Thu, 20 Sep 2007 15:58:53 +0200 + +#---------------------------------------------# +# Git merge, branches and unisonX.Y.Z package # +#---------------------------------------------# + +The unison package is represented by the master branch in git. unisonX.Y.Z are +represented through X.Y.Z/{master|upstream} branches. + +To create a new branch: +- git checkout master +- git branch X.Y.Z/master +- git checkout X.Y.Z/master +- go through the checklist (see after) +- git checkout upstream +- git branch X.Y.Z/upstream +- git checkout pristine-tar +- copy and rename corresponding pristine tar files to allow a + unisonX.Y.Z.orig.tar.gz to be recreated. + +To merge a branch X.Y.Z/master: +- git checkout X.Y.Z/master +- dch "Synchronize with unison package:" && git add debian/changelog + && git commit +- git merge master +- solve conflicts and go through checlist (see after) + +To merge the branch master: +- git checkout master +- dch "Synchronize with unisonX.Y.Z package:" && git add debian/changelog + && git commit +- git merge X.Y.Z/master +- solve conflicts and go through checlist (see after) + +Checklist: +- debian/changelog: check that changelog has not been erased +- debian/control: rename every package to unisonX.Y.Z or unisonX.Y.Z-gtk (or + for unison package unison and unison-gtk) +- debian/gbp.conf: check that content end with + upstream-branch = X.Y.Z/upstream + debian-branch = X.Y.Z/master + debian-tag = debian/unisonX.Y.Z-%(version)s + or (for unison package) + nothing + + -- Sylvain Le Gall Fri, 26 Feb 2010 01:12:22 +0100 --- unison-2.32.52.orig/debian/NEWS.Debian +++ unison-2.32.52/debian/NEWS.Debian @@ -0,0 +1,45 @@ +unison (2.13.16-1) unstable; urgency=low + + As of version 2.10.2, the package use an alternative to let the user + choose between unison and unison2.9.1 binaries for unison and + unison-gtk. The binaries used in unison and unison-gtk package were + versionned binaries (ie unison2.10.2 and unison2.10.2-gtk). This was a + mistake. When trying to upgrade to new upstream version, former + alternatives were not removed and you keep symlinks to non existent + binaries (ie you stay with unison pointing to unison2.10.2). This + behavior is corrected by using a stable name for unison binaries (ie + unison-latest-stable). + + If you have configured alternatives, you may encounter some problem, + because during upgrade the symlink won't be updated, since it has been + user configured. In this case, you should run "update-alternatives + --auto unison && update-alternatives --auto unison-gtk" to restore the + good behavior. + + -- Sylvain Le Gall Sat, 13 Aug 2005 20:17:11 +0200 + +unison (2.10.2-2) unstable; urgency=low + + Upgrading from version 2.9.1 to 2.10.2 involves a lot of changes. In + particular, most of the configuration of the former stable release + (2.9.1) is no longer valid. Archive format has changed: if you have any + unsynchronized changes when you upgrade to this new archive format, you + have to merge them all by hand. You can also use the new package + unison2.9.1 (which is the former stable release) to synchronise your + old archive before migrating. + + Version 2.10.2 and 2.9.1 are not compatible. You will need to have the + same version of unison on both end of the synchronisation link (ie if + you need to synchronise two computers, you will need to have unison + 2.10.2 on both). + + -- Sylvain Le Gall Mon, 25 Apr 2005 23:06:44 +0200 + +unison (2.10.2-1) unstable; urgency=medium + + With this new stable release, a package split has been made. Now the + package unison will always hold the latest stable release of unison. + If you need to use the former stable release, you will need to install + unison2.9.1, which is a new debian package. + + -- Sylvain Le Gall Tue, 19 Apr 2005 00:08:05 +0200 --- unison-2.32.52.orig/debian/unison.install.in +++ unison-2.32.52/debian/unison.install.in @@ -0,0 +1,2 @@ +@UNISON@ /usr/bin/ +debian/@UNISON_PACKAGE@.completion.bash /etc/bash_completion.d/@UNISON_PACKAGE@ --- unison-2.32.52.orig/debian/watch +++ unison-2.32.52/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-([0-9\.]*)\.tar\.gz --- unison-2.32.52.orig/debian/git-merge.ml +++ unison-2.32.52/debian/git-merge.ml @@ -0,0 +1,45 @@ +#!/usr/bin/ocamlrun ocaml + +#use "topfind";; +#require "fileutils";; + +open FileUtil;; + +let save fn = + let tmp = + Filename.temp_file ("unison-merge-"^(Filename.basename fn)) ".bak" + in + cp [fn] tmp; + fn, tmp + +let restore ?(ext="") (fn, tmp) = + mv tmp (fn^ext) + +let fns = + [ + "debian/changelog"; + "debian/control"; + "debian/gbp.conf"; + ] + +let baks = + List.rev_map save fns + +let () = + try + let cmd = + "git merge "^(String.concat " " (List.tl (Array.to_list Sys.argv))) + in + prerr_endline ("Runnning "^cmd); + match Sys.command cmd with + | 0 -> + List.iter restore baks + | n -> + Printf.eprintf + "Command '%s' exited with code %d/n%!" + cmd + n; + List.iter (restore ~ext:".old") baks + + with e -> + rm (List.map snd baks) --- unison-2.32.52.orig/debian/changelog +++ unison-2.32.52/debian/changelog @@ -0,0 +1,375 @@ +unison (2.32.52-1ubuntu2) maverick; urgency=low + + * Refresh change-logfile-location.dpatch. + + -- Ilya Barygin Sat, 08 May 2010 14:37:17 +0000 + +unison (2.32.52-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - Change default logfile directory to .unison by prepending + .unison to name of logfile in ubase/trace.ml. For this reason + debian/patches/00list still include change-logfile-location + * New upstream version fixes bugs: + - file permissions probem, LP: #304453 + - slowliness on large files, LP: #394895 + - "Failed: Not_found" after directory rename, LP: #569647 + + -- Ilya Barygin Sat, 08 May 2010 13:56:17 +0000 + +unison (2.32.52-1) unstable; urgency=low + + * New upstream release (Closes: #559054) + * Merge changes from unison2.27.57: + * Move ${F:OtherUnison*} fields first due to a problem when merging + conflicts in dpkg-gencontrol + * Generate manpage using debian/generate-manpage.ml and output of 'unison + -help', so manpage is always up-to-date + (Closes: #524526, #517972, #524475) + * Backup files changed during build (lwt/depend, ubase/depend) + + -- Sylvain Le Gall Sat, 27 Feb 2010 18:57:02 +0000 + +unison (2.27.57-4) unstable; urgency=low + + * Merge changes from unison2.27.57: + * Update Standards-Version to 3.8.4 (no change) + * Stop using dh_desktop + * Use dh_ocaml 0.9 features (auto dependencies) + * unison binaries are custom executables, so we can remove Depends on any + ocaml-base* packages (Closes: #540481) + * Add bash_completion (Closes: #349782, #481070) + * Use the full path to access icon in .desktop (Closes: #541700) + * Patch from unison trunk to remove 'Connected ...' message even when + -silent is set (Closes: #497729, #551199) + * Auto generate conflicts with unisonX.Y.Z or unison (X.Y.Z) package + (Closes: #570910) + * Enhance templating for unison and unison-gtk common files + + -- Sylvain Le Gall Thu, 25 Feb 2010 01:00:47 +0000 + +unison (2.27.57-2ubuntu2) lucid; urgency=low + + * No-change rebuild for OCaml 3.11.2 transition (LP: #527627). + + -- Ilya Barygin Thu, 25 Feb 2010 20:53:22 +0300 + +unison (2.27.57-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #377652), remaining changes: + - Change default logfile directory to .unison by prepending + .unison to name of logfile in ubase/trace.ml. For this reason + debian/patches/00list still include change-logfile-location + + -- Andreas Olsson Mon, 03 Aug 2009 20:32:54 +0200 + +unison (2.27.57-2) unstable; urgency=low + + * Correct typo in documentation, thanks to Lucas B. Cohen + (Closes: #137960, #129478, #466173) + * Switch packaging to git + * Set maintainer to Debian OCaml Maintainers + * Add dh-ocaml build-dependency (rules/ocaml.mk) + * Upgrade debian/compat to 7 + * Upgrade Standards-Version to 3.8.0 (debian/README.source) + * Add ${misc:Depends} to dependencies + * Update debian/copyright file to use + http://wiki.debian.org/Proposals/CopyrightFormat + * Remove obsolete debian/control.in related variables and files + + -- Sylvain Le Gall Thu, 05 Mar 2009 12:10:11 +0100 + +unison (2.27.57-1ubuntu1) intrepid; urgency=low + + * Change default logfile directory to .unison + by prepending .unison to name of logfile in ubase/trace.ml + (Closes: LP #234365) + * Change Maintainer to Ubuntu MOTU Developers + + -- Tan Rui Boon Sun, 08 Jun 2008 00:19:02 +0800 + +unison (2.27.57-1) unstable; urgency=low + + [ Sylvain Le Gall] + * New upstream release (Closes: #462598): + * New option mountpoint can help avoid problem with removable media + (Closes: #349674) + * Unset CFLAGS in debian/rules (Closes: #476051) + * Upgrade to standards version 3.7.3 (no change) + * Update README.Debian to add new package unison2.13.16 + * Remove debian/control.in + * Remove now useless gtkfont patch + * Change doc-base section to File Management + + [ Stefano Zacchiroli ] + * promote Homepage to a real debian/control field, now that dpkg supports it + * fix vcs-svn field to point just above the debian/ dir + + -- Sylvain Le Gall Mon, 14 Apr 2008 19:39:39 +0200 + +unison (2.13.16-9) unstable; urgency=low + + * Use a correct way to test thing in shell (Closes: #443715) + + -- Sylvain Le Gall Sun, 23 Sep 2007 23:54:42 +0200 + +unison (2.13.16-8) unstable; urgency=low + + * Change section from net to utils + * Tighten build-dependency on lablgtk2 and librsvg2 + * Rework description of the package + + -- Sylvain Le Gall Thu, 20 Sep 2007 16:53:23 +0200 + +unison (2.13.16-7) unstable; urgency=low + + * Upgrade debian/watch version to 3, + * Upgrade debhelper debian/compat to 5, + * Use CDBS for debian/rules, + * Add debian/unison-gtk.desktop.in (Closes: #387666, #422495), + * Add a note in README.Debian about removable media + * Change my email address to gildor@debian.org, + * Change email address to gildor@debian.org everywhere + * Rebuild for ocaml 3.10.0 + * Add icons for unison-gtk + * Use ocamlopt.opt when possible + * Provide a link from unison to unison-2.13 to work with + "addversionno = true" (Closes: #368418, #392099) + * Apply patche 01gtkfont to stop trying to use deprecated + font setting, thanks to Norman Ramsey (Closes: #372545) + * Add a note on what unison-latest-stable is supposed to do in + README.Debian (Closes: #361900), in the same time explain failure + when trying to upgrade with update-alternatives (Closes: #335413) + * unison-gtk is now an alternative to unison (Closes: #411297) + * change stable release codename to Etch in README.Debian + (Closes: #394738) + + -- Sylvain Le Gall Thu, 20 Sep 2007 15:58:53 +0200 + +unison (2.13.16-6) unstable; urgency=low + + * Add a note in README.Debian concerning the use of removable media + * Use ubuntu patch against bashism (Closes: #376362) + + -- Sylvain Le Gall Thu, 15 Feb 2007 22:36:17 +0100 + +unison (2.13.16-5) unstable; urgency=low + + * Rebuild for OCaml 3.09.1 + + -- Sylvain Le Gall Tue, 7 Feb 2006 00:36:07 +0100 + +unison (2.13.16-4) unstable; urgency=low + + * Forget to replace 3.08.3 by $(OCAMLABI) in the substvar + OCaml:Interpreter + + -- Sylvain Le Gall Sat, 3 Dec 2005 00:56:50 +0100 + +unison (2.13.16-3) unstable; urgency=low + + * Remove hardcoded OCaml ABI + + -- Sylvain Le Gall Fri, 2 Dec 2005 23:26:39 +0100 + +unison (2.13.16-2) unstable; urgency=low + + * Recommend ssh-client | openssh-client rather than ssh + * Remove dependency between unison and unison-gtk: + * Copy manual to unison-gtk.1 + * Install documentation in all package + * (Closes: #308683) + * Use "mv unison $(UNISON)" and "$(UNISON_GTK)" rather than supplying + NAME=$(UNISON) when building (Closes: #325932, #326589, #326395, #325812) + * Remove reference to PostScript/HTML in the manpages (Closes: #323859) + * Reformat NEWS.Debian to limit line length to 72 (Closes: #326154) + + -- Sylvain Le Gall Mon, 5 Sep 2005 23:50:34 +0200 + +unison (2.13.16-1) unstable; urgency=low + + * New upstream release (Closes: #322042) + * Use the same binary version scheme as the "-addversionno" unison + option (Closes: #308507) + * Change the menu section to Apps/Tools (Closes: #308683). + * The conflict between unison and unison-gtk as proposed in bug #308683 will + not be used: + * the dependency is mainly a documentation dependency (symlink for + unison-gtk.1.gz and /usr/share/doc/unison-gtk ) + * user can choose to install both unison and unison-gtk + * Correct a problem in the alternative system: when a package is upgraded + upstream, the binary provided is also changed (ie going from + /usr/bin/unison-2.12.0 to /usr/bin/unison-2.13.16). So we symlinked the + binary to unison-latest-stable and use this binary in the alternative + system. + * Add a unison[-gtk].preinst in order to correct the former behavior of + update alternatives. + * Transition to svn-buildpackage + + -- Sylvain Le Gall Sat, 13 Aug 2005 20:17:11 +0200 + +unison (2.12.0-1) unstable; urgency=low + + * New upstream release + * Change the watch file to allow QA to use it + * Upgrade standards version to 3.6.2.0 (no change) + + -- Sylvain Le Gall Thu, 28 Jul 2005 00:15:20 +0200 + +unison (2.10.2-3) unstable; urgency=low + + * Backport of sarge changes. Unison doesn't read/write on + $HOME/.unison, it is only a hack used in Fspath.canonizeFspath + and called from Os.unisonDir. Set the HOME variable before + generating to be $(CURDIR) in debian/rules (Closes in sarge:#308773) + + -- Sylvain Le Gall Fri, 13 May 2005 00:11:09 +0200 + +unison (2.10.2-2) unstable; urgency=low + + * Using PACKAGE_VERSION to substitute variable in doc-base. (Closes: #307411) + * unison-gtk now recommends ssh-askpass, put a note in README.Debian + concerning the fact that ssh-askpass is required for using a password + protected SSH connection (Closes: #238854) + * State the changes of archive format from 2.9.1 to 2.10.2 in NEWS.Debian + (Closes: #308126) + + -- Sylvain Le Gall Mon, 9 May 2005 00:47:47 +0200 + +unison (2.10.2-1) unstable; urgency=medium + + * Transition to ocaml 3.08.3 ( Closes: #304124 ) + * Split the package unison in unison2.9.1 and unison for being able to + have 2 versions of the protocol. + * Use update-alternative to be able to install both unison2.9.1 and + unison + * Revisit the build system : use sed and mv to create package unison2.9.1 + and unison ( rename debhelper files in rule, subsitute @VERSION@ by the + right version in the content of some files ). + * Conflicts with package unison (<< 2.9.1-2 ), because this package install + a binary "unison" which will conflict with update-alternative + * Use a "Provide: unison" to manage the oldest package ( which provides + also unison, but with a slightly different protocol ). + * Remove the patch 01_ocaml_3_08 since it is applied upstream + * Use a GTK2 interface, since GTK1 interface doesn't even build + (Closes: #252617) + * No more HTML/PS documentation, only text documentation, because it is the + only one i can produce without doing severe licence violation ( the former + HTML version comes from a strange unison-manual.tex, which cannot be + found, so i don't have the source and i cannot distribute files without + source ) ( Closes: #171063, #184465 ) + * New upstream release ( Closes: #271415 ) + * Add NEWS.Debian to explain the split of the package + * Correct and add a section to README.Debian. + + -- Sylvain Le Gall Tue, 19 Apr 2005 00:08:05 +0200 + +unison (2.9.1-2) unstable; urgency=medium + + * Version to fix maintainer fields + + -- Sylvain Le Gall Mon, 7 Jun 2004 22:58:50 +0200 + +unison (2.9.1-1) unstable; urgency=medium + + * New upstream version. (closes: #142748) + * Medium urgency to make woody release. Rationale: + - upstream versions of unison are rarely, if ever, broken, and if + they are, are fixed within days. this release has had a week or + two to sweat it out. + - the previous version had problems on windows. seeing as + cross-platform compatibility is a major feature of unison, this + could cause long-term aggrivation for people hoping to sync their + woody box with their windows box. + - unison's protocol is version specific, and if I waited until sid + released to upload this new version, I'd have to provide an old + version in sid sooner than I'd have liked. + - it'd really annoy me if the version in woody wasn't the latest + when it released. =) + + -- Robert McQueen Wed, 24 Apr 2002 19:05:08 +0100 + +unison (2.8.1-2) unstable; urgency=low + + * Moved to main. + + -- Robert McQueen Sat, 30 Mar 2002 04:13:46 +0000 + +unison (2.8.1-1) unstable; urgency=low + + * New upstream version. (closes: #138576) + * Added menu entry for unison-gtk. (closes: #133039) + * Changed 'lablgtk, libgtk1.2-dev' build dep to 'liblablgtk-ocaml-dev'. + * Updated manpage for new/removed options. + + -- Robert McQueen Fri, 29 Mar 2002 19:22:33 +0000 + +unison (2.7.7-1) unstable; urgency=medium + + * New upstream version. Fixes bugs in connecting and the client + startup sequence. + + -- Robert McQueen Sun, 23 Sep 2001 19:27:27 +0100 + +unison (2.7.1-2) unstable; urgency=low + + * Added libgtk1.2-dev build dep, but this is really a bug in lablgtk. + * Optimised debian/rules to only call shell once to set a variable, and + use that instead of an elaborate (and fallible) if construct. + + -- Robert McQueen Thu, 30 Aug 2001 12:57:44 +0100 + +unison (2.7.1-1) unstable; urgency=low + + * New upstream version. (closes: #106983) + * Moved package to non-US/main - it recommends ssh. (closes: #109406) + * Added the GTK interface version in a seperate unison-gtk package. + (closes: #105911) + * Added symlinks from unison-gtk's documentation and manpage to + unison's. + * Amended the manpage to detail the unison-gtk binary and changed + command line options. + * Install 'NEWS' file as upstream changelog, which it is, and remove + some extraneous docs. + + -- Robert McQueen Thu, 30 Aug 2001 01:21:14 +0100 + +unison (2.6.11-2) unstable; urgency=low + + * Added newline before descriptions are returned. (closes: #86621) + * Fixed gratuitous debhelperism - version 3 is not required. + (closes: #97563) + + -- Robert McQueen Tue, 15 May 2001 20:36:43 +0100 + +unison (2.6.11-1) unstable; urgency=low + + * New upstream version. + + -- Robert McQueen Mon, 30 Apr 2001 19:06:03 +0100 + +unison (2.6.1-2) unstable; urgency=low + + * Fixed to take account of no native (ocamlopt) compiler on some archs. + * Minor debian/rules cleanups. + + -- Robert McQueen Thu, 28 Dec 2000 18:23:55 +0000 + +unison (2.6.1-1) unstable; urgency=low + + * Package adopted by new Debian maintainer. (closes: #75968) + * New upstream version. (closes: #65601) + + -- Robert McQueen Fri, 10 Nov 2000 23:12:02 +0000 + +unison (1.180-2) unstable; urgency=low + + * Changed the architecture field from all to any. + + -- Sven LUTHER Mon, 10 Jan 2000 19:50:16 +0100 + +unison (1.180-1) unstable; urgency=low + + * Initial release. + + -- Sven LUTHER Tue, 21 Dec 1999 12:15:49 +0100 --- unison-2.32.52.orig/debian/utils/purify_unison +++ unison-2.32.52/debian/utils/purify_unison @@ -0,0 +1,29 @@ +#!/bin/sh + +PACKAGE=unison +VERSION=$2 +ORIG=$1 + +set -e + +if test -d $PACAKGE-$VERSION; then + echo "Directory $PACKAGE-$VERSION exists" + exit 1 +fi + + +tar xzf $ORIG + +rm -f $PACKAGE-$VERSION/mt/threads.obj +rm -f $PACKAGE-$VERSION/non-mt/threads.cmi +rm -f $PACKAGE-$VERSION/non-mt/threads.cmx +rm -f $PACKAGE-$VERSION/non-mt/threads.o +rm -f $PACKAGE-$VERSION/non-mt/threads.obj +rm -f $PACKAGE-$VERSION/win32rc/unison.res +rm -f $PACKAGE-$VERSION/win32rc/unison.res.lib + +chmod 644 $PACKAGE-$VERSION/INSTALL +chmod 644 $PACKAGE-$VERSION/Makefile.OCaml + +tar czf $ORIG $PACKAGE-$VERSION/ +rm -rf $PACKAGE-$VERSION --- unison-2.32.52.orig/debian/templates/prerm +++ unison-2.32.52/debian/templates/prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove unison /usr/bin/@UNISON_SELF_ALTERNATIVE@ +fi + +#DEBHELPER# --- unison-2.32.52.orig/debian/templates/completion.bash +++ unison-2.32.52/debian/templates/completion.bash @@ -0,0 +1,35 @@ +_@UNISON_SELF_VAR@() { + local cur profiles + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + + # Get option with unison -help | grep "^ -" | cut -f 3 -d " " + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '-addprefsto -addversionno -auto -backup \ + -backupcurrent -backupcurrentnot -backupdir -backuplocation -backupnot \ + -backupprefix -backups -backupsuffix -batch -confirmbigdeletes \ + -confirmmerge -contactquietly -debug -doc -dumbtty -fastcheck -follow \ + -force -forcepartial -group -height -host -ignore -ignorecase \ + -ignorelocks -ignorenot -immutable -immutablenot -key -killserver -label \ + -log -logfile -maxbackups -maxthreads -merge -mountpoint -numericids \ + -owner -path -perms -prefer -preferpartial -pretendwin -repeat -retry \ + -root -rootalias -rsrc -rsync -selftest -servercmd -showarchive -silent \ + -socket -sortbysize -sortfirst -sortlast -sortnewfirst -sshargs -sshcmd \ + -terse -testserver -times -ui -version -xferbycopying' -- "$cur" ) ) + else + if [ -d $HOME/.unison ]; then + for i in $HOME/.unison/*.prf; do + if test -e $i; then + profiles="$profiles $(basename ${i%.prf})" + fi + done + fi + COMPREPLY=( $( compgen -W '$profiles' -- $cur ) ); + fi + + return 0 +} + +complete -o plusdirs -F _@UNISON_SELF_VAR@ @UNISON_SELF@ --- unison-2.32.52.orig/debian/templates/manpages +++ unison-2.32.52/debian/templates/manpages @@ -0,0 +1 @@ +debian/@UNISON_SELF@.1 --- unison-2.32.52.orig/debian/templates/postinst +++ unison-2.32.52/debian/templates/postinst @@ -0,0 +1,15 @@ +#!/bin/sh -e + +# This file is common between unison and unison-gtk package +if @IS_GTK@; then + update-alternatives --install /usr/bin/unison-gtk unison-gtk /usr/bin/@UNISON_GTK_ALTERNATIVE@ @PRIORITY@ \ + --slave /usr/share/man/man1/unison-gtk.1.gz unison-gtk.1.gz /usr/share/man/man1/@UNISON_GTK_ALTERNATIVE@.1.gz + + update-alternatives --install /usr/bin/unison unison /usr/bin/@UNISON_GTK_ALTERNATIVE@ @PRIORITY@ \ + --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON_GTK_ALTERNATIVE@.1.gz +else + update-alternatives --install /usr/bin/unison unison /usr/bin/@UNISON_ALTERNATIVE@ @PRIORITY@ \ + --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON_ALTERNATIVE@.1.gz +fi + +#DEBHELPER# --- unison-2.32.52.orig/debian/templates/links +++ unison-2.32.52/debian/templates/links @@ -0,0 +1,4 @@ +usr/bin/@UNISON_SELF@ usr/bin/@UNISON_SELF_ALTERNATIVE@ +usr/bin/@UNISON_SELF@ usr/bin/@UNISON_SELF_VERSIONNO@ +usr/share/man/man1/@UNISON_SELF@.1.gz usr/share/man/man1/@UNISON_SELF_ALTERNATIVE@.1.gz +usr/share/man/man1/@UNISON_SELF@.1.gz usr/share/man/man1/@UNISON_SELF_VERSIONNO@.1.gz --- unison-2.32.52.orig/debian/templates/preinst +++ unison-2.32.52/debian/templates/preinst @@ -0,0 +1,18 @@ +#!/bin/sh -e + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt "2.13.16-1" && dpkg --compare-versions "$2" ge "2.10.2-1"; then + # This file is common between unison and unison-gtk package + if @IS_GTK@; then + echo "Deleting alternatives to unison2.10.2-gtk" + update-alternatives --remove unison-gtk /usr/bin/unison2.10.2-gtk + else + echo "Deleting alternatives to unison2.10.2" + update-alternatives --remove unison /usr/bin/unison2.10.2 + fi + fi + ;; +esac + +#DEBHELPER# --- unison-2.32.52.orig/debian/templates/dirs +++ unison-2.32.52/debian/templates/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +etc/bash_completion.d --- unison-2.32.52.orig/debian/patches/debbug497729_silent.dpatch +++ unison-2.32.52/debian/patches/debbug497729_silent.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debbug497729_silent.dpatch by Sylvain Le Gall +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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) --- unison-2.32.52.orig/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch +++ unison-2.32.52/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debbug129478_strings_typo_ignore_regexp.dpatch by Lucas B. Cohen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 @@ + \032 changed. Instead of putting a line of the form\n\ + \032 ignore = \n\ + \032 in your profile (.unison/default.prf), you should put:\n\ +- \032 ignore = Regexp \n\ ++ \032 ignore = Regex \n\ + \032 Moreover, two other styles of pattern are also recognized:\n\ + \032 ignore = Name \n\ + \032 matches any path in which one component matches , while\n\ --- unison-2.32.52.orig/debian/patches/debbug466173_strings_typo_follw.dpatch +++ unison-2.32.52/debian/patches/debbug466173_strings_typo_follw.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debbug466173_strings_typo_follw.dpatch by Lucas B. Cohen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 @@ + \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\ --- unison-2.32.52.orig/debian/patches/00list +++ unison-2.32.52/debian/patches/00list @@ -0,0 +1,5 @@ +change-logfile-location.dpatch +debbug129478_strings_typo_ignore_regexp +debbug137960_strings_obsolete_ssh_info +debbug466173_strings_typo_follw +debbug497729_silent --- unison-2.32.52.orig/debian/patches/change-logfile-location.dpatch +++ unison-2.32.52/debian/patches/change-logfile-location.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## change-logfile-location.dpatch by Tan Rui Boon +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change logfile location +## DP: by prepending .unison to name of logfile in ubase/trace.ml + +@DPATCH@ +diff -urNad unison-2.27.57~/ubase/trace.ml unison-2.27.57/ubase/trace.ml +--- unison-2.27.57~/ubase/trace.ml 2007-04-02 11:03:20.000000000 +0800 ++++ unison-2.27.57/ubase/trace.ml 2008-06-02 14:24:54.000000000 +0800 +@@ -98,10 +98,10 @@ + + let logfile = + Prefs.createString "logfile" +- (Util.fileInHomeDir "unison.log") ++ (Util.fileInHomeDir ".unison/unison.log") + "!logfile name" + "By default, logging messages will be appended to the file +- \\verb|unison.log| in your HOME directory. Set this preference if ++ \\verb|unison.log| in your .unison directory. Set this preference if + you prefer another file." + + let logch = ref None --- unison-2.32.52.orig/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch +++ unison-2.32.52/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debbug137960_strings_obsolete_ssh_info.dpatch by Lucas B. Cohen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 @@ + \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\ +@@ -2425,9 +2423,8 @@ + \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\ +- \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\