[Pkg-ocaml-maint-commits] r1746 - trunk/packages/unison/trunk/debian
Sylvain LE GALL
gildor-guest at costa.debian.org
Mon Sep 5 22:26:31 UTC 2005
Author: gildor-guest
Date: 2005-09-05 22:26:30 +0000 (Mon, 05 Sep 2005)
New Revision: 1746
Added:
trunk/packages/unison/trunk/debian/unison-gtk.manpages.in
trunk/packages/unison/trunk/debian/unison.manpages.in
Removed:
trunk/packages/unison/trunk/debian/unison.docs.in
Modified:
trunk/packages/unison/trunk/debian/NEWS.Debian
trunk/packages/unison/trunk/debian/changelog
trunk/packages/unison/trunk/debian/control
trunk/packages/unison/trunk/debian/rules
trunk/packages/unison/trunk/debian/unison.1.in
Log:
Merge changes from unison2.9.1 and correct serious bugs -- SLG
Modified: trunk/packages/unison/trunk/debian/NEWS.Debian
===================================================================
--- trunk/packages/unison/trunk/debian/NEWS.Debian 2005-09-05 21:22:24 UTC (rev 1745)
+++ trunk/packages/unison/trunk/debian/NEWS.Debian 2005-09-05 22:26:30 UTC (rev 1746)
@@ -1,40 +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
+ 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.
+ 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 <sylvain.le-gall at polytechnique.org> 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.
+ 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).
+ 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 <sylvain.le-gall at polytechnique.org> 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.
+ 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 <sylvain.le-gall at polytechnique.org> Tue, 19 Apr 2005 00:08:05 +0200
Modified: trunk/packages/unison/trunk/debian/changelog
===================================================================
--- trunk/packages/unison/trunk/debian/changelog 2005-09-05 21:22:24 UTC (rev 1745)
+++ trunk/packages/unison/trunk/debian/changelog 2005-09-05 22:26:30 UTC (rev 1746)
@@ -1,3 +1,17 @@
+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 <sylvain.le-gall at polytechnique.org> Mon, 5 Sep 2005 23:50:34 +0200
+
unison (2.13.16-1) unstable; urgency=low
* New upstream release (Closes: #322042)
Modified: trunk/packages/unison/trunk/debian/control
===================================================================
--- trunk/packages/unison/trunk/debian/control 2005-09-05 21:22:24 UTC (rev 1745)
+++ trunk/packages/unison/trunk/debian/control 2005-09-05 22:26:30 UTC (rev 1746)
@@ -8,7 +8,7 @@
Package: unison
Architecture: any
Depends: ${shlibs:Depends}, ${interpreter:Depends}
-Recommends: ssh
+Recommends: ssh-client | openssh-client
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
@@ -32,9 +32,9 @@
Package: unison-gtk
Architecture: any
-Depends: unison (= ${Source-Version}), ${shlibs:Depends}, ${interpreter:Depends}
+Depends: ${shlibs:Depends}, ${interpreter:Depends}
Conflicts: unison-gtk (<< 2.9.1-3)
-Recommends: ssh-askpass
+Recommends: ssh-askpass, ssh-client | openssh-client
Description: A file-synchronization tool for Unix and Windows - GTK interface
This package adds the optional GTK interface to the file synchronization
tool 'unison'.
Modified: trunk/packages/unison/trunk/debian/rules
===================================================================
--- trunk/packages/unison/trunk/debian/rules 2005-09-05 21:22:24 UTC (rev 1745)
+++ trunk/packages/unison/trunk/debian/rules 2005-09-05 22:26:30 UTC (rev 1746)
@@ -3,46 +3,54 @@
# In order to use dpatch
include /usr/share/dpatch/dpatch.make
-PACKAGE=unison
+PACKAGE=$(shell dpkg-parsechangelog | awk "/Source: .*/ { gsub(\"Source: \",\"\"); print }")
# Variable that will be replaced in files
VERSION=$(shell dpkg-parsechangelog | awk "/Version: .*/ { gsub(\"Version: \",\"\"); gsub(\"-.*\",\"\"); print; }")
# 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
+
+ifeq ($(PACKAGE),"unison")
+PACKAGE_VERSION=
PRIORITY=20
+else
+PACKAGE_VERSION=$(VERSION)
+PRIORITY=10
+endif
UNISON=unison-$(VERSION)
UNISON_MAJ=UNISON-$(VERSION)
UNISON_PACKAGE=unison$(PACKAGE_VERSION)
-UNISON_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_PACKAGE),unison-latest-stable)
+UNISON_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON),unison-latest-stable)
UNISON_GTK=unison-$(VERSION)-gtk
UNISON_GTK_PACKAGE=$(UNISON_PACKAGE)-gtk
-UNISON_GTK_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_GTK_PACKAGE),unison-latest-stable-gtk)
+UNISON_GTK_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_GTK),unison-latest-stable-gtk)
# End of variable to be replaced
# set $(NATIVE) to true if this arch has an optimising compiler
NATIVE := $(shell test -x /usr/bin/ocamlopt -o -x /usr/bin/ocamlopt.opt && echo true || echo false)
+UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2)
# which file to rename for following the version
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.preinst.in
+RENAME += debian/unison.manpages.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
RENAME += debian/unison-gtk.preinst.in
+RENAME += debian/unison-gtk.manpages.in
build: build-stamp
build-stamp: patch-stamp
@@ -71,10 +79,14 @@
# We always need to rename the manual
mv debian/$(UNISON_PACKAGE).1 debian/$(UNISON).1
+ # We copy unison.1 to unison-gtk.1
+ cp debian/$(UNISON).1 debian/$(UNISON_GTK).1
- $(MAKE) UISTYLE=gtk2 NATIVE=$(NATIVE) NAME=$(UNISON_GTK)
+ $(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE)
+ mv unison $(UNISON_GTK)
- $(MAKE) UISTYLE=text NATIVE=$(NATIVE) NAME=$(UNISON)
+ $(MAKE) UISTYLE=text NATIVE=$(NATIVE)
+ mv unison $(UNISON)
env HOME=$(CURDIR) $(CURDIR)/$(UNISON) -doc all > $(CURDIR)/unison-manual.txt
@@ -95,7 +107,7 @@
DST=$${DST%%.in}; \
$(RM) $$DST; \
done
- -$(RM) debian/$(UNISON).1 unison-manual.txt $(UNISON_GTK) $(UNISON)
+ -$(RM) debian/$(UNISON).1 debian/$(UNISON_GTK).1 unison-manual.txt $(UNISON_GTK) $(UNISON)
-$(MAKE) clean
dh_clean
@@ -108,10 +120,6 @@
$(CURDIR)/debian/$(UNISON_PACKAGE)/usr/bin
install -o root -g root -m 755 $(UNISON_GTK) \
$(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/bin
- ln -s $(UNISON_PACKAGE) \
- $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/doc/$(UNISON_GTK_PACKAGE)
- ln -s $(UNISON).1.gz \
- $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/man/man1/$(UNISON_GTK).1.gz
# Creating symlink from binary to $(UNISON_ALTERNATIVE) and $(UNISON_GTK_ALTERNATIVE)
for i in \
$(CURDIR)/debian/$(UNISON_PACKAGE)/usr/bin/$(UNISON_ALTERNATIVE) \
@@ -135,11 +143,11 @@
dh_testroot
# Move temporarly the doc-base.in because dh_installdocs will take it into consideration
mv debian/unison.doc-base.in debian/unison.doc-base-in
- dh_installdocs
+ dh_installdocs -A BUGS.txt TODO.txt unison-manual.txt
mv debian/unison.doc-base-in debian/unison.doc-base.in
dh_installmenu
- dh_installman debian/$(UNISON).1
- dh_installchangelogs NEWS
+ dh_installman
+ dh_installchangelogs -A NEWS
dh_compress
dh_fixperms
dh_installdeb
Copied: trunk/packages/unison/trunk/debian/unison-gtk.manpages.in (from rev 1745, trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.manpages.in)
Modified: trunk/packages/unison/trunk/debian/unison.1.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.1.in 2005-09-05 21:22:24 UTC (rev 1745)
+++ trunk/packages/unison/trunk/debian/unison.1.in 2005-09-05 22:26:30 UTC (rev 1746)
@@ -213,7 +213,7 @@
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_PACKAGE@/.
+manual, available as text in /usr/share/doc/@UNISON_PACKAGE@/.
.SH AUTHOR
This manual page was written by Robert McQueen <robot101 at debian.org>,
for the Debian GNU/Linux system (but may be used by others).
Deleted: trunk/packages/unison/trunk/debian/unison.docs.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.docs.in 2005-09-05 21:22:24 UTC (rev 1745)
+++ trunk/packages/unison/trunk/debian/unison.docs.in 2005-09-05 22:26:30 UTC (rev 1746)
@@ -1,4 +0,0 @@
-BUGS.txt
-TODO.txt
-unison-manual.txt
-debian/NEWS.Debian
Copied: trunk/packages/unison/trunk/debian/unison.manpages.in (from rev 1745, trunk/packages/unison/unison2.9.1/trunk/debian/unison.manpages.in)
More information about the Pkg-ocaml-maint-commits
mailing list