debian/0000775000000000000000000000000012143512457007174 5ustar debian/rules0000775000000000000000000001741412143512021010246 0ustar #!/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 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 # configure:: cp config/Makefile.unix config/Makefile 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 rm lwt/depend ubase/depend 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-convert -f png -w 32 -h 32 -o $@ $^ 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 debian/watch0000664000000000000000000000015512143512021010211 0ustar version=3 http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-(2.32.[0-9\.]*)\.tar\.gz debian/utils/0000775000000000000000000000000012143512457010334 5ustar debian/utils/purify_unison0000775000000000000000000000112712143512021013157 0ustar #!/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 debian/changelog0000664000000000000000000003717212143512421011047 0ustar unison2.32.52 (2.32.52-7ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - debian/patches/change-logfile-location.patch: Change default logfile directory to .unison by prepending .unison to name of logfile in ubase/trace.ml. -- Logan Rosen Sat, 11 May 2013 14:58:43 -0400 unison2.32.52 (2.32.52-7) unstable; urgency=low * Backport a patch from Unison 2.40.102 to fix compatibility with OCaml >= 4 -- Stéphane Glondu Sat, 11 May 2013 12:30:14 +0200 unison2.32.52 (2.32.52-6ubuntu1) raring; 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. * Dropped changes: - debian/rules: use rsvg-convert, rsvg does note exist anymore (done in Debian) -- Logan Rosen Sat, 27 Oct 2012 17:48:27 -0400 unison2.32.52 (2.32.52-6) unstable; urgency=low * Suggest unison-all * Use rsvg-convert instead of rsvg (Closes: #666281) -- Stéphane Glondu Sat, 31 Mar 2012 19:22:54 +0200 unison2.32.52 (2.32.52-5ubuntu1) precise; urgency=low * Merge from debian (LP: #937596): * debian/rules: use rsvg-convert, rsvg does note exist anymore * Change default logfile directory to .unison by prepending .unison to name of logfile in ubase/trace.ml. -- Julian Taylor Tue, 28 Feb 2012 20:04:01 +0100 unison2.32.52 (2.32.52-5) unstable; urgency=low * Remove unison-gtk alternative on uninstall (Closes: #656355) * Fix link order to list C objects before the libraries they require (Closes: #657423) * Add myself to Uploaders, remove Sylvain -- Stéphane Glondu Fri, 27 Jan 2012 07:31:13 +0100 unison2.32.52 (2.32.52-4) unstable; urgency=low * Team upload * Fork a unison2.32.52 package, to maintain compatibility with squeeze * debian/control: - replace Conflicts by Replaces/Breaks - bump Standards-Version to 3.9.2 (no changes) -- Stéphane Glondu Sun, 08 Jan 2012 13:03:50 +0100 unison (2.32.52-3) unstable; urgency=low * Team upload * Remove obsolete README.source * Add Fix-bad-interaction-with-OpenSSH-5.6.patch (Closes: #620031) -- Stéphane Glondu Sun, 03 Apr 2011 13:16:18 +0200 unison (2.32.52-2) unstable; urgency=low * Team upload * Switch source package format to 3.0 (quilt) * Add patch to fix build with OCaml 3.12 (Closes: #585453) * Add "set -e" to maintainer scripts * Remove conflicts older than oldstable * Bump Standards-Version to 3.9.1 -- Stéphane Glondu Thu, 10 Feb 2011 12:21:24 +0100 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-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-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 debian/compat0000664000000000000000000000000212143512021010355 0ustar 7 debian/unison-gtk.menu.in0000664000000000000000000000041412143512021012547 0ustar ?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" debian/unison-gtk.install.in0000664000000000000000000000052312143512021013252 0ustar 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@ debian/copyright0000664000000000000000000000207712143512021011120 0ustar Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 Upstream-Contact: Benjamin Pierce Source: http://www.cis.upenn.edu/~bcpierce/unison/download/stable/ 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-2 file. Files: * Copyright: 1999-2009, Benjamin Pierce et al License: GPL-2+ Files: debian/* Copyright: 2006-2009, Sylvain Le Gall 2012, Stéphane Glondu License: GPL-2+ Files: debian/unison-gtk.svg Copyright: 2007, Eric Lavarde License: GPL-2+ debian/source/0000775000000000000000000000000012143512457010474 5ustar debian/source/format0000664000000000000000000000001412143512021011665 0ustar 3.0 (quilt) debian/README.Debian0000664000000000000000000001432212143512021011222 0ustar #---------------# # 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 debian/generate-manpage.ml0000664000000000000000000000707112143512021012716 0ustar #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 debian/unison.install.in0000664000000000000000000000020412143512021012463 0ustar @UNISON@ /usr/bin/ debian/@UNISON_PACKAGE@.completion.bash /etc/bash_completion.d/@UNISON_PACKAGE@ debian/NEWS.Debian0000664000000000000000000000416312143512021011043 0ustar 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 debian/git-merge.ml0000775000000000000000000000151512143512021011376 0ustar #!/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) debian/unison-intro.1.in0000664000000000000000000000532512143512021012317 0ustar .\" 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@/. debian/unison-outro.1.in0000664000000000000000000000113312143512021012325 0ustar .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). debian/unison-gtk.desktop.in0000664000000000000000000000052212143512021013254 0ustar [Desktop Entry] 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 debian/control0000664000000000000000000000642612143512021010572 0ustar Source: unison2.32.52 Section: utils Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu Build-Depends: cdbs (>= 0.4.23), debhelper (>= 7), 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.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/ Package: unison2.32.52 Architecture: any Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends} Recommends: ssh-client | openssh-client Suggests: unison-all 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 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: unison2.32.52-gtk Architecture: any Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends} Replaces: ${F:OtherUnisonGtk} Breaks: ${F:OtherUnisonGtk} Recommends: ssh-askpass, ssh-client | openssh-client Suggests: unison-all-gtk 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 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. debian/unison.doc-base.in0000664000000000000000000000113512143512021012476 0ustar 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 debian/unison-gtk.svg.in0000664000000000000000000001304212143512021012403 0ustar 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 debian/templates/0000775000000000000000000000000012143512457011172 5ustar debian/templates/prerm0000664000000000000000000000037312143512021012230 0ustar #!/bin/sh set -e if [ "$1" = "remove" ]; then update-alternatives --remove unison /usr/bin/@UNISON_SELF_ALTERNATIVE@ if @IS_GTK@; then update-alternatives --remove unison-gtk /usr/bin/@UNISON_SELF_ALTERNATIVE@ fi fi #DEBHELPER# debian/templates/manpages0000664000000000000000000000002712143512021012672 0ustar debian/@UNISON_SELF@.1 debian/templates/postinst0000664000000000000000000000135712143512021012771 0ustar #!/bin/sh set -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# debian/templates/links0000664000000000000000000000047412143512021012225 0ustar 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 debian/templates/preinst0000664000000000000000000000103012143512021012556 0ustar #!/bin/sh set -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# debian/templates/completion.bash0000664000000000000000000000254112143512021014167 0ustar _@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@ debian/templates/dirs0000664000000000000000000000006112143512021012036 0ustar usr/bin usr/share/man/man1 etc/bash_completion.d debian/gbp.conf0000664000000000000000000000021612143512021010575 0ustar [DEFAULT] pristine-tar = True upstream-branch = 2.32.52/upstream debian-branch = 2.32.52/master debian-tag = debian/unison2.32.52-%(version)s debian/patches/0000775000000000000000000000000012143512457010623 5ustar debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch0000664000000000000000000000162212143512044024020 0ustar From: Colin Watson Date: Fri, 27 Jan 2012 07:25:23 +0100 Subject: Fix link order to list C objects before the libraries they require Author: Colin Watson Forwarded: yes Last-Update: 2011-09-10 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657423 --- Makefile.OCaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.OCaml b/Makefile.OCaml index 00d6756..0fec866 100644 --- a/Makefile.OCaml +++ b/Makefile.OCaml @@ -366,7 +366,7 @@ win32rc/unison.res.lib: win32rc/unison.res $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS) @echo Linking $@ - $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^ + $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS) # Unfortunately -output-obj does not put .o files into the output, only .cmx # files, so we have to use $(LD) to take care of COBJS. -- debian/patches/0001-Typo-in-ignore-Regex-help.patch0000664000000000000000000000161612143512044017034 0ustar 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 file changed, 1 insertion(+), 1 deletion(-) 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 = \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\ -- debian/patches/0004-Fix-silent-behaviour.patch0000664000000000000000000000155712143512044016231 0ustar From: Sylvain Le Gall 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 file changed, 2 insertions(+), 1 deletion(-) 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) -- debian/patches/change-logfile-location.patch0000664000000000000000000000137312143512021016305 0ustar Description: Change logfile location ... by prepending .unison to name of logfile in ubase/trace.ml Author: Tan Rui Boon Bug-Debian: http://bugs.debian.org/484997 Bug-Ubuntu: https://bugs.launchpad.net/bugs/234365 Forwarded: no Last-Update: 2011-09-10 --- a/ubase/trace.ml +++ b/ubase/trace.ml @@ -113,10 +113,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 debian/patches/series0000664000000000000000000000055112143512100012022 0ustar 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 0006-Fix-bad-interaction-with-OpenSSH-5.6.patch 0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch 0008-OCaml-4-hash-compatibility.patch change-logfile-location.patch debian/patches/0003-Typo-missing-o-in-follow.patch0000664000000000000000000000156412143512044016764 0ustar 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 file changed, 1 insertion(+), 1 deletion(-) 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\ -- debian/patches/0008-OCaml-4-hash-compatibility.patch0000664000000000000000000001051312143512044017145 0ustar From: Stephane Glondu Date: Sat, 11 May 2013 12:22:15 +0200 Subject: OCaml 4 hash compatibility This is a backport of a patch introduced in Unison 2.40.102. Signed-off-by: Stephane Glondu --- name.ml | 2 +- path.ml | 2 -- path.mli | 1 - props.ml | 6 +++--- update.ml | 4 ++-- uutil.ml | 4 ++++ uutil.mli | 2 ++ xferhint.ml | 4 ++-- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/name.ml b/name.ml index 020c496..3de893b 100644 --- a/name.ml +++ b/name.ml @@ -42,4 +42,4 @@ let fromString s = s let hash n = - Hashtbl.hash (if Case.insensitive () then String.lowercase (Case.normalize n) else n) + Uutil.hash (if Case.insensitive () then String.lowercase (Case.normalize n) else n) diff --git a/path.ml b/path.ml index fb05bc3..05f9f3c 100644 --- a/path.ml +++ b/path.ml @@ -191,8 +191,6 @@ let addPrefixToFinalName path prefix = assert (not (isEmpty path)); prefix ^ path -let hash p = Hashtbl.hash p - (* Pref controlling whether symlinks are followed. *) let follow = Pred.create "follow" ("Including the preference \\texttt{-follow \\ARG{pathspec}} causes Unison to \ diff --git a/path.mli b/path.mli index dd75b05..5113fdd 100644 --- a/path.mli +++ b/path.mli @@ -31,7 +31,6 @@ val addSuffixToFinalName : local -> string -> local val addPrefixToFinalName : local -> string -> local val compare : t -> t -> int -val hash : local -> int val followLink : local -> bool diff --git a/props.ml b/props.ml index c4b9b84..8fad0b9 100644 --- a/props.ml +++ b/props.ml @@ -277,7 +277,7 @@ let hash id h = (match id with IdIgnored -> -1 | IdNumeric i -> i - | IdNamed nm -> Hashtbl.hash nm) + | IdNamed nm -> Uutil.hash nm) h let similar id id' = @@ -429,7 +429,7 @@ let moduloOneHour t = let hash t h = Uutil.hash2 (match t with - Synced f -> Hashtbl.hash (moduloOneHour (approximate f)) + Synced f -> Uutil.hash (moduloOneHour (approximate f)) | NotSynced _ -> 0) h @@ -597,7 +597,7 @@ type t = string option let dummy = None -let hash t h = Uutil.hash2 (Hashtbl.hash t) h +let hash t h = Uutil.hash2 (Uutil.hash t) h let similar t t' = not (Prefs.read Osx.rsrc) || t = t' diff --git a/update.ml b/update.ml index 5e58f65..493bf7f 100644 --- a/update.ml +++ b/update.ml @@ -234,9 +234,9 @@ let rec checkArchive (top: bool) (path: Path.t) (arch: archive) (h: int): int = (checkArchive false (Path.child path n) a h)) children (Props.hash desc h) | ArchiveFile (desc, dig, _, ress) -> - Uutil.hash2 (Hashtbl.hash dig) (Props.hash desc h) + Uutil.hash2 (Uutil.hash dig) (Props.hash desc h) | ArchiveSymlink content -> - Uutil.hash2 (Hashtbl.hash content) h + Uutil.hash2 (Uutil.hash content) h | NoArchive -> 135 diff --git a/uutil.ml b/uutil.ml index 84d8762..75cf8cb 100644 --- a/uutil.ml +++ b/uutil.ml @@ -34,6 +34,10 @@ let myNameAndVersion = myName ^ " " ^ myVersion let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF +external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" + +let hash x = hash_param 10 100 x + (*****************************************************************************) (* File sizes *) (*****************************************************************************) diff --git a/uutil.mli b/uutil.mli index 369e577..f7dd78e 100644 --- a/uutil.mli +++ b/uutil.mli @@ -13,6 +13,8 @@ val myNameAndVersion : string (* Hashing *) val hash2 : int -> int -> int +(* Hash function (OCaml 3.x version) *) +val hash : 'a -> int module type FILESIZE = sig type t diff --git a/xferhint.ml b/xferhint.ml index abe3dd6..ad74fb4 100644 --- a/xferhint.ml +++ b/xferhint.ml @@ -32,7 +32,7 @@ module PathMap = (struct type t = Fspath.t * Path.local let hash (fspath, path) = - (Hashtbl.hash (Fspath.toString fspath) + 13217 * Path.hash path) + (Uutil.hash (Fspath.toString fspath) + 13217 * Uutil.hash path) land 0x3FFFFFFF let equal = (=) @@ -41,7 +41,7 @@ module FPMap = Hashtbl.Make (struct type t = Os.fullfingerprint - let hash = Hashtbl.hash + let hash = Uutil.hash let equal = (=) end) -- debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch0000664000000000000000000000116312143512044020543 0ustar From: Stephane Glondu Date: Sun, 3 Apr 2011 11:44:19 +0200 Subject: Fix bad interaction with OpenSSH 5.6 Origin: https://bugs.archlinux.org/task/20877 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031 --- terminal.ml | 1 - 1 file changed, 1 deletion(-) diff --git a/terminal.ml b/terminal.ml index 657f3d2..aafa425 100644 --- a/terminal.ml +++ b/terminal.ml @@ -191,7 +191,6 @@ let create_session cmd args new_stdin new_stdout new_stderr = exit 127 end | childPid -> - Unix.close slaveFd; (Some masterFd, childPid) end -- debian/patches/0002-Fix-obsolete-help-about-ssh.patch0000664000000000000000000000401212143512044017401 0ustar 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 file 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\ \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\ -- debian/patches/0005-Fix-build-with-OCaml-3.12.patch0000664000000000000000000000125212143512044016364 0ustar From: =?UTF-8?q?St=C3=A9phane=20Glondu?= 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 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.mli b/update.mli index dc1e018..c99c704 100644 --- a/update.mli +++ b/update.mli @@ -1,7 +1,7 @@ (* Unison file synchronizer: src/update.mli *) (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) -module NameMap : Map.S with type key = Name.t +module NameMap : MyMap.S with type key = Name.t type archive = ArchiveDir of Props.t * archive NameMap.t --