[Pkg-ocaml-maint-commits] r1313 - trunk/packages/unison/trunk/debian

Sylvain LE GALL gildor-guest@costa.debian.org
Mon, 25 Apr 2005 21:27:20 +0000


Author: gildor-guest
Date: 2005-04-25 21:27:19 +0000 (Mon, 25 Apr 2005)
New Revision: 1313

Added:
   trunk/packages/unison/trunk/debian/unison-gtk.dirs.in
   trunk/packages/unison/trunk/debian/unison-gtk.menu.in
   trunk/packages/unison/trunk/debian/unison-gtk.postinst.in
   trunk/packages/unison/trunk/debian/unison-gtk.prerm.in
   trunk/packages/unison/trunk/debian/unison.1.in
   trunk/packages/unison/trunk/debian/unison.dirs.in
   trunk/packages/unison/trunk/debian/unison.doc-base.in
   trunk/packages/unison/trunk/debian/unison.docs.in
   trunk/packages/unison/trunk/debian/unison.postinst.in
   trunk/packages/unison/trunk/debian/unison.prerm.in
Removed:
   trunk/packages/unison/trunk/debian/unison-gtk.dirs
   trunk/packages/unison/trunk/debian/unison-gtk.menu
   trunk/packages/unison/trunk/debian/unison-gtk.postinst
   trunk/packages/unison/trunk/debian/unison-gtk.prerm
   trunk/packages/unison/trunk/debian/unison.1
   trunk/packages/unison/trunk/debian/unison.dirs
   trunk/packages/unison/trunk/debian/unison.doc-base
   trunk/packages/unison/trunk/debian/unison.docs
   trunk/packages/unison/trunk/debian/unison.postinst
   trunk/packages/unison/trunk/debian/unison.prerm
Modified:
   trunk/packages/unison/trunk/debian/README.Debian
   trunk/packages/unison/trunk/debian/changelog
   trunk/packages/unison/trunk/debian/control
   trunk/packages/unison/trunk/debian/rules
   trunk/packages/unison/trunk/debian/watch
Log:
Move a lot of file, for the new build system -- SLG


Modified: trunk/packages/unison/trunk/debian/README.Debian
===================================================================
--- trunk/packages/unison/trunk/debian/README.Debian	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/README.Debian	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,9 +1,9 @@
-Documentation for Unison is in the manual, which is available
-in HTML, PostScript and 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'.
+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'
@@ -17,3 +17,31 @@
 the unison-gtk package.
 
  -- Robert McQueen <robot101@debian.org>  Wed, 29 Aug 2001 21:18:29 +0100
+
+This package has been split when Unison 2.10.2 was released. 
+There exist now two version of the package : 
+- unison, unison-gtk ( version 2.10.2 )
+- 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 (ie Woody). 
+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 unison2.9.1, 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 ( ie 2.11.0 ).
+
+By this way, you should always be able to synchronise 
+stable/testing/unstable  system using unison ( the good version 
+of unison ).
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Mon, 25 Apr 2005 23:06:44 +0200  
+

Modified: trunk/packages/unison/trunk/debian/changelog
===================================================================
--- trunk/packages/unison/trunk/debian/changelog	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/changelog	2005-04-25 21:27:19 UTC (rev 1313)
@@ -4,14 +4,14 @@
   * 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
-    unison2.10.2
+    unison
   * Revisit the build system : use sed and mv to create package unison2.9.1
-    and unisonXXX ( rename debhelper files in rule, subsitute @VERSION@ by the
+    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 two new package ( which provides
-    both unison, but with a slightly different protocol ).
+  * 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
@@ -20,6 +20,8 @@
     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 <sylvain.le-gall@polytechnique.org>  Tue, 19 Apr 2005 00:08:05 +0200
 

Modified: trunk/packages/unison/trunk/debian/control
===================================================================
--- trunk/packages/unison/trunk/debian/control	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/control	2005-04-25 21:27:19 UTC (rev 1313)
@@ -5,11 +5,10 @@
 Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, liblablgtk2-ocaml-dev, dpatch, chrpath
 Standards-Version: 3.6.1.0
 
-Package: unison2.10.2
+Package: unison
 Architecture: any
 Depends: ${shlibs:Depends}, ${interpreter:Depends}
 Recommends: ssh
-Provides: unison
 Conflicts: 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
@@ -31,10 +30,9 @@
  specification, and is resilient to failure due to its careful 
  handling of the replicas and its private structures.
 
-Package: unison2.10.2-gtk
+Package: unison-gtk
 Architecture: any
-Depends: unison2.10.2 (= ${Source-Version}), ${shlibs:Depends}, ${interpreter:Depends}
-Provides: unison-gtk
+Depends: unison (= ${Source-Version}), ${shlibs:Depends}, ${interpreter:Depends}
 Conflicts: unison-gtk (<< 2.9.1-3)
 Description: A file-synchronization tool for Unix and Windows - GTK interface
  This package adds the optional GTK interface to the file synchronization

Modified: trunk/packages/unison/trunk/debian/rules
===================================================================
--- trunk/packages/unison/trunk/debian/rules	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/rules	2005-04-25 21:27:19 UTC (rev 1313)
@@ -5,6 +5,9 @@
 
 PACKAGE=unison
 VERSION=2.10.2
+# Package version should be set to the version you want to be appended to 
+# the package name
+PACKAGE_VERSION=
 # PRIORITY should be set to 10 for stable compatibility package 
 # and to 20 for unstable/testing package
 PRIORITY=20
@@ -13,16 +16,16 @@
 NATIVE := $(shell test -x /usr/bin/ocamlopt -o -x /usr/bin/ocamlopt.opt && echo true || echo false)
 
 # which file to rename for following the version
-RENAME := debian/unison.1 
-RENAME += debian/unison.dirs 
-RENAME += debian/unison.doc-base 
-RENAME += debian/unison.docs 
-RENAME += debian/unison.postinst
-RENAME += debian/unison.prerm
-RENAME += debian/unison-gtk.dirs 
-RENAME += debian/unison-gtk.menu
-RENAME += debian/unison-gtk.postinst
-RENAME += debian/unison-gtk.prerm
+RENAME := debian/unison.1.in 
+RENAME += debian/unison.dirs.in 
+RENAME += debian/unison.doc-base.in
+RENAME += debian/unison.docs.in
+RENAME += debian/unison.postinst.in
+RENAME += debian/unison.prerm.in
+RENAME += debian/unison-gtk.dirs.in
+RENAME += debian/unison-gtk.menu.in
+RENAME += debian/unison-gtk.postinst.in
+RENAME += debian/unison-gtk.prerm.in
 
 build: build-stamp
 build-stamp: patch-stamp
@@ -31,7 +34,8 @@
 	# rename all the debhelper files needed and substitue the @VERSION@
 	# string
 	for i in $(RENAME); do \
-	  sed -e "s/@VERSION@/$(VERSION)/g" $$i | sed -e "s/@PRIORITY@/$(PRIORITY)/g" > $${i/unison/unison$(VERSION)}; \
+	  sed -e "s/@VERSION@/$(VERSION)/g" $$i | sed -e "s/@PRIORITY@/$(PRIORITY)/g" > \
+	  $${$${i/unison/unison$(PACKAGE_VERSION)}%%.in}; \
 	done
 
 	$(MAKE) UISTYLE=gtk2 NATIVE=$(NATIVE) NAME=unison$(VERSION)-gtk
@@ -52,7 +56,7 @@
 	-$(RM) build-stamp configure-stamp
 	# remove the renamed files
 	-for i in $(RENAME); do \
-	  $(RM) $${i/unison/unison$(VERSION)}; \
+	  $(RM) $${$${i/unison/unison$(PACKAGE_VERSION)}%%.in}; \
 	done
 	-$(RM) unison$(VERSION)-manual.txt unison$(VERSION)-gtk unison$(VERSION)
 	-$(MAKE) clean
@@ -64,13 +68,13 @@
 	dh_clean -k
 	dh_installdirs
 	install -o root -g root -m 755 unison$(VERSION) \
-	  $(CURDIR)/debian/unison$(VERSION)/usr/bin
+	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)/usr/bin
 	install -o root -g root -m 755 unison$(VERSION)-gtk \
-	  $(CURDIR)/debian/unison$(VERSION)-gtk/usr/bin
+	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/bin
 	ln -s unison$(VERSION) \
-	  $(CURDIR)/debian/unison$(VERSION)-gtk/usr/share/doc/unison$(VERSION)-gtk
+	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/doc/unison$(VERSION)-gtk
 	ln -s unison$(VERSION).1.gz \
-	  $(CURDIR)/debian/unison$(VERSION)-gtk/usr/share/man/man1/unison$(VERSION)-gtk.1.gz
+	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/man/man1/unison$(VERSION)-gtk.1.gz
 
 binary-indep: build install
 

Deleted: trunk/packages/unison/trunk/debian/unison-gtk.dirs
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.dirs	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison-gtk.dirs	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/doc
-usr/share/man/man1

Copied: trunk/packages/unison/trunk/debian/unison-gtk.dirs.in (from rev 1303, trunk/packages/unison/trunk/debian/unison-gtk.dirs)

Deleted: trunk/packages/unison/trunk/debian/unison-gtk.menu
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.menu	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison-gtk.menu	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,3 +0,0 @@
-?package(unison@VERSION@-gtk):needs="x11" section="Apps/Net" \
- title="Unison @VERSION@ (GTK)" command="/usr/bin/unison@VERSION@-gtk" \
- longtitle="Unison @VERSION@ file synchronizer (GTK interface)"

Copied: trunk/packages/unison/trunk/debian/unison-gtk.menu.in (from rev 1303, trunk/packages/unison/trunk/debian/unison-gtk.menu)

Deleted: trunk/packages/unison/trunk/debian/unison-gtk.postinst
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.postinst	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison-gtk.postinst	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --install /usr/bin/unison-gtk unison-gtk /usr/bin/unison@VERSION@-gtk @PRIORITY@ \
-  --slave /usr/share/man/man1/unison-gtk.1.gz unison-gtk.1.gz /usr/share/man/man1/unison@VERSION@-gtk.1.gz 
-
-#DEBHELPER#

Copied: trunk/packages/unison/trunk/debian/unison-gtk.postinst.in (from rev 1303, trunk/packages/unison/trunk/debian/unison-gtk.postinst)

Deleted: trunk/packages/unison/trunk/debian/unison-gtk.prerm
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.prerm	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison-gtk.prerm	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ]; then
-	update-alternatives --remove unison-gtk /usr/bin/unison@VERSION@-gtk
-fi
-
-#DEBHELPER#

Copied: trunk/packages/unison/trunk/debian/unison-gtk.prerm.in (from rev 1303, trunk/packages/unison/trunk/debian/unison-gtk.prerm)

Deleted: trunk/packages/unison/trunk/debian/unison.1
===================================================================
--- trunk/packages/unison/trunk/debian/unison.1	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison.1	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,219 +0,0 @@
-.\"                                      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@VERSION@ 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 <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-unison@VERSION@ \- a file-synchronization tool for Unix and Windows
-.SH SYNOPSIS
-.B unison@VERSION@
-.RI [ options ]
-.br
-.B unison@VERSION@
-root1 root2
-.RI [ options ]
-.br
-.B unison@VERSION@
-profilename
-.RI [ options ]
-.br
-.B unison@VERSION@-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@VERSION@/. The
-unison@VERSION@-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.
-.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@VERSION@/.
-.TP
-.B \-addprefsto
-specify a file to add new preferences to in interactive mode
-.TP
-.B \-addversionno
-add version number to name of unison@VERSION@ executable on server
-.TP
-.B \-auto
-automatically accept default actions
-.TP
-.B \-backup xxx
-add a regexp to the backup list
-.TP
-.B \-backups
-keep backup copies of files (deprecated: use 'backup')
-.TP
-.B \-batch
-batch mode: ask no questions at all
-.TP
-.B \-contactquietly
-suppress the 'contacting server' message during startup
-.TP
-.B \-debug xxx
-debug module xxx ('all' -> everything, 'verbose' -> more)
-.TP
-.B \-doc xxx
-show documentation ('-doc topics' lists topics)
-.TP
-.B \-dumbtty
-do not try to change terminal settings in text UI
-.TP
-.B \-editor xxx
-command for displaying the output of the -merge program
-.TP
-.B \-fastcheck
-do fast (and slightly unsafe) update detection on windows
-.TP
-.B \-follow xxx
-add a regexp to the follow list
-.TP
-.B \-force xxx
-force changes from this replica to the other
-.TP
-.B \-group
-synchronize group
-.TP
-.B \-height n
-height (in lines) of main window in graphical interface
-.TP
-.B \-ignore xxx
-add a regexp to the ignore list
-.TP
-.B \-ignorecase
-ignore upper/lowercase spelling of filenames
-.TP
-.B \-ignorenot xxx
-add a regexp to the ignorenot list
-.TP
-.B \-killserver
-kill server when done (even when using sockets)
-.TP
-.B \-log
-record actions in file specified by logfile preference
-.TP
-.B \-logfile xxx
-log file name
-.TP
-.B \-maxbackups n
-number of backed up versions of a file to keep
-.TP
-.B \-merge xxx
-command for merging conflicting files
-.TP
-.B \-merge2 xxx
-command for merging files (when no common version exists)
-.TP
-.B \-numericids
-don't map uid/gid values by user/group names
-.TP
-.B \-owner
-synchronize owner
-.TP
-.B \-path xxx
-path to synchronize
-.TP
-.B \-perms n
-part of the permissions which is synchronized
-.TP
-.B \-prefer xxx
-choose this replica's version in case of conflict
-.TP
-.B \-root xxx
-root of a replica
-.TP
-.B \-rootalias xxx
-register alias for canonical root names
-.TP
-.B \-rshargs xxx
-other arguments (if any) for remote shell command
-.TP
-.B \-rshcmd xxx
-path to the rsh executable
-.TP
-.B \-servercmd xxx
-name of unison executable on remote server
-.TP
-.B \-silent
-print nothing (except error messages)
-.TP
-.B \-socket xxx
-act as a server on a socket
-.TP
-.B \-sortbysize
-list changed files by size, not name
-.TP
-.B \-sortfirst xxx
-add a regexp to the sortfirst list
-.TP
-.B \-sortlast xxx
-add a regexp to the sortlast list
-.TP
-.B \-sortnewfirst
-list new before changed files
-.TP
-.B \-sshcmd xxx
-path to the ssh executable
-.TP
-.B \-statusdepth n
-status display depth for local files
-.TP
-.B \-terse
-suppress status messages
-.TP
-.B \-testserver
-exit immediately after the connection to the server
-.TP
-.B \-times
-synchronize modification times
-.TP
-.B \-ui xxx
-select user interface ('text' or 'graphic')
-.TP
-.B \-version
-print version and exit
-.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 HTML, PostScript and text in /usr/share/doc/unison@VERSION@/.
-.SH AUTHOR
-This manual page was written by Robert McQueen <robot101@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).

Copied: trunk/packages/unison/trunk/debian/unison.1.in (from rev 1303, trunk/packages/unison/trunk/debian/unison.1)

Deleted: trunk/packages/unison/trunk/debian/unison.dirs
===================================================================
--- trunk/packages/unison/trunk/debian/unison.dirs	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison.dirs	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1 +0,0 @@
-usr/bin

Copied: trunk/packages/unison/trunk/debian/unison.dirs.in (from rev 1303, trunk/packages/unison/trunk/debian/unison.dirs)

Deleted: trunk/packages/unison/trunk/debian/unison.doc-base
===================================================================
--- trunk/packages/unison/trunk/debian/unison.doc-base	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison.doc-base	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,13 +0,0 @@
-Document: unison@VERSION@-manual
-Title: Unison @VERSION@ Installation and Usage Manual
-Author: Benjamin Pierce <bcpierce@cis.upenn.edu>
-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: Apps/Tools
-
-Format: text
-Files: /usr/share/doc/unison@VERSION@/unison-manual.txt.gz

Copied: trunk/packages/unison/trunk/debian/unison.doc-base.in (from rev 1303, trunk/packages/unison/trunk/debian/unison.doc-base)

Deleted: trunk/packages/unison/trunk/debian/unison.docs
===================================================================
--- trunk/packages/unison/trunk/debian/unison.docs	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison.docs	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,3 +0,0 @@
-BUGS.txt
-TODO.txt
-unison-manual.txt

Copied: trunk/packages/unison/trunk/debian/unison.docs.in (from rev 1303, trunk/packages/unison/trunk/debian/unison.docs)

Deleted: trunk/packages/unison/trunk/debian/unison.postinst
===================================================================
--- trunk/packages/unison/trunk/debian/unison.postinst	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison.postinst	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --install /usr/bin/unison unison /usr/bin/unison@VERSION@ @PRIORITY@ \
-  --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/unison@VERSION@.1.gz 
-
-#DEBHELPER#

Copied: trunk/packages/unison/trunk/debian/unison.postinst.in (from rev 1303, trunk/packages/unison/trunk/debian/unison.postinst)

Deleted: trunk/packages/unison/trunk/debian/unison.prerm
===================================================================
--- trunk/packages/unison/trunk/debian/unison.prerm	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/unison.prerm	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ]; then
-	update-alternatives --remove unison /usr/bin/unison@VERSION@
-fi
-
-#DEBHELPER#

Copied: trunk/packages/unison/trunk/debian/unison.prerm.in (from rev 1303, trunk/packages/unison/trunk/debian/unison.prerm)

Modified: trunk/packages/unison/trunk/debian/watch
===================================================================
--- trunk/packages/unison/trunk/debian/watch	2005-04-25 20:48:03 UTC (rev 1312)
+++ trunk/packages/unison/trunk/debian/watch	2005-04-25 21:27:19 UTC (rev 1313)
@@ -1,2 +1,2 @@
 version=3
-http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-(2.9.[0-9\.]*)/THIS-IS-UNISON-([0-9\.]*)
+http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/THIS-IS-UNISON-([0-9\.]*)