[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.40.63-1-7-gbdf225e
Stephane Glondu
steph at glondu.net
Thu Jan 26 06:29:39 UTC 2012
The following commit has been merged in the master branch:
commit d016d00212cbe145c470f51b74268671ce00bc07
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Jan 14 11:27:19 2012 +0100
Remove trailing whitespaces in debian/*
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index bd123b7..271c545 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -33,13 +33,13 @@ unison (2.10.2-2) unstable; urgency=low
you need to synchronise two computers, you will need to have unison
2.10.2 on both).
- -- Sylvain Le Gall <gildor at debian.org> Mon, 25 Apr 2005 23:06:44 +0200
-
+ -- Sylvain Le Gall <gildor at debian.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.
+ unison2.9.1, which is a new debian package.
-- Sylvain Le Gall <gildor at debian.org> Tue, 19 Apr 2005 00:08:05 +0200
diff --git a/debian/README.Debian b/debian/README.Debian
index 5235350..06ada6d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,11 +2,11 @@
# 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
+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
@@ -26,8 +26,8 @@ the unison-gtk package.
# 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 :
+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)
@@ -39,7 +39,7 @@ 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").
+"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
@@ -51,32 +51,32 @@ 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).
+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 <gildor at debian.org> Mon, 25 Apr 2005 23:06:44 +0200
+ -- Sylvain Le Gall <gildor at debian.org> Mon, 25 Apr 2005 23:06:44 +0200
#-------------#
# ssh-askpass #
#-------------#
-Ssh-askpass is a recommended package when using unison-gtk. The reason
+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
+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
+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 <gildor at debian.org> Mon, 9 May 2005 00:47:47 +0200
-
+
#-----------------#
# removable media #
#-----------------#
@@ -87,10 +87,10 @@ 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
+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
+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 <gildor at debian.org> Thu, 15 Feb 2007 22:12:48 +0100
@@ -100,17 +100,17 @@ why unison keep asking you what you really want to do.
#----------------------#
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
+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.
+doesn't exists.
-If you use unison-latest-stable, you are sure to use the most up-to-date stable
+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
+upgrading the package from major version to major version (when the version
of unison change).
-- Sylvain Le Gall <gildor at debian.org> Thu, 20 Sep 2007 15:58:53 +0200
@@ -120,7 +120,7 @@ of unison change).
#---------------------------------------------#
The unison package is represented by the master branch in git. unisonX.Y.Z are
-represented through X.Y.Z/{master|upstream} branches.
+represented through X.Y.Z/{master|upstream} branches.
To create a new branch:
- git checkout master
@@ -135,15 +135,15 @@ To create a new branch:
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
+- 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
+- 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)
@@ -155,7 +155,7 @@ Checklist:
upstream-branch = X.Y.Z/upstream
debian-branch = X.Y.Z/master
debian-tag = debian/unisonX.Y.Z-%(version)s
- or (for unison package)
+ or (for unison package)
nothing
-- Sylvain Le Gall <gildor at debian.org> Fri, 26 Feb 2010 01:12:22 +0100
diff --git a/debian/copyright b/debian/copyright
index 7df89b9..aa5cfc6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,7 @@ On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL-2 file.
Files: debian/*
-Copyright: (C) 2006-2009 Sylvain Le Gall
+Copyright: (C) 2006-2009 Sylvain Le Gall
License: GPL-2+
Files: debian/unison-gtk.svg
diff --git a/debian/generate-manpage.ml b/debian/generate-manpage.ml
index 82758b8..e30c633 100644
--- a/debian/generate-manpage.ml
+++ b/debian/generate-manpage.ml
@@ -2,15 +2,15 @@
#load "str.cma"
let option_no_arg opt hlp =
- List.iter print_endline
+ List.iter print_endline
[
".TP";
".B \\"^opt;
hlp
]
-let option_arg opt arg hlp =
- List.iter print_endline
+let option_arg opt arg hlp =
+ List.iter print_endline
[
".TP";
".B \\"^opt^" "^arg;
@@ -18,46 +18,46 @@ let option_arg opt arg hlp =
]
let () =
- let fn =
+ let fn =
Filename.temp_file "unison-" ".txt"
in
begin
- try
- let cmd =
+ try
+ let cmd =
(String.concat " " (List.tl (Array.to_list Sys.argv)))^
" -help > "^
(Filename.quote fn)
in
- match Sys.command cmd with
+ match Sys.command cmd with
| 2 ->
begin
- let actions =
+ let actions =
(* *)
(List.map
(fun (s, f) -> Str.regexp s, f)
[
- " *\\(-[a-z_-]+\\) xxx +\\(.*\\)",
- (fun s ->
+ " *\\(-[a-z_-]+\\) xxx +\\(.*\\)",
+ (fun s ->
option_arg
(Str.matched_group 1 s)
"xxx"
(Str.matched_group 2 s));
- " *\\(-[a-z_-]+\\) n +\\(.*\\)",
- (fun s ->
+ " *\\(-[a-z_-]+\\) n +\\(.*\\)",
+ (fun s ->
option_arg
(Str.matched_group 1 s)
"n"
(Str.matched_group 2 s));
- " *\\(-[a-z_-]+\\) +\\(.*\\)",
+ " *\\(-[a-z_-]+\\) +\\(.*\\)",
(fun s ->
option_no_arg
(Str.matched_group 1 s)
(Str.matched_group 2 s));
])
@
- (List.map
+ (List.map
(fun s -> Str.regexp s, ignore)
[
"Advanced options:";
@@ -72,21 +72,21 @@ let () =
open_in fn
in
begin
- try
- while true do
+ try
+ while true do
let line =
input_line chn
in
- try
+ try
let (r, a) =
List.find
- (fun (r, a) ->
+ (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
+ before calling a, to fill the good
variable in Str
*)
Str.string_match r line 0
@@ -94,7 +94,7 @@ let () =
a line
with Not_found ->
- failwith
+ failwith
(Printf.sprintf
"No matching regexp for '%s'"
line)
diff --git a/debian/git-merge.ml b/debian/git-merge.ml
index ede5e16..df407b9 100755
--- a/debian/git-merge.ml
+++ b/debian/git-merge.ml
@@ -15,7 +15,7 @@ let save fn =
let restore ?(ext="") (fn, tmp) =
mv tmp (fn^ext)
-let fns =
+let fns =
[
"debian/changelog";
"debian/control";
@@ -25,18 +25,18 @@ let fns =
let baks =
List.rev_map save fns
-let () =
- try
- let cmd =
+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
+ match Sys.command cmd with
| 0 ->
List.iter restore baks
| n ->
- Printf.eprintf
- "Command '%s' exited with code %d/n%!"
+ Printf.eprintf
+ "Command '%s' exited with code %d/n%!"
cmd
n;
List.iter (restore ~ext:".old") baks
diff --git a/debian/rules b/debian/rules
index 104e509..29fdb42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ UNISON_GTK_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_GTK),unison-latest-stabl
UNISON_GTK_VERSIONNO=unison-$(VERSIONNO)-gtk
UNISON_GTK_VAR=$(call TR,$(UNISON_GTK))
-RENAME := debian/unison.1.in
+RENAME := debian/unison.1.in
RENAME += debian/unison.doc-base.in
RENAME += debian/unison-gtk.menu.in
RENAME += debian/unison-gtk.svg.in
@@ -83,12 +83,12 @@ UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || ech
DEB_INSTALL_DOCS_ALL := BUGS.txt TODO.txt unison-manual.txt -X unison.doc-base.in
-DEB_INSTALL_CHANGELOGS_ALL := NEWS
+DEB_INSTALL_CHANGELOGS_ALL := NEWS
#
# Build unison
#
-
+
configure::
cp config/Makefile.unix config/Makefile
@@ -205,7 +205,7 @@ common-binary-arch:: template
# Rename and substitute files
#
-unison-rename: unison-rename-stamp
+unison-rename: unison-rename-stamp
unison-rename-stamp: $(RENAME)
# Rename all the debhelper files needed and substitue the @XXX@
# string
@@ -214,7 +214,7 @@ unison-rename-stamp: $(RENAME)
sed $(SED_REPLACE) $$i > "$(CURDIR)/$$DST"; \
done
- # We always need to rename the manual
+ # 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'
@@ -227,7 +227,7 @@ clean::
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).1'
-$(RM) '$(CURDIR)/debian/$(UNISON_GTK).1'
-$(RM) '$(CURDIR)/unison-rename-stamp'
diff --git a/debian/templates/completion.bash b/debian/templates/completion.bash
index 54c1c94..8378949 100644
--- a/debian/templates/completion.bash
+++ b/debian/templates/completion.bash
@@ -27,7 +27,7 @@ _ at UNISON_SELF_VAR@() {
done
fi
COMPREPLY=( $( compgen -W '$profiles' -- $cur ) );
- fi
+ fi
return 0
}
diff --git a/debian/templates/links b/debian/templates/links
index 8f5d7ac..b8b1736 100644
--- a/debian/templates/links
+++ b/debian/templates/links
@@ -1,4 +1,4 @@
usr/bin/@UNISON_SELF@ usr/bin/@UNISON_SELF_ALTERNATIVE@
usr/bin/@UNISON_SELF@ usr/bin/@UNISON_SELF_VERSIONNO@
-usr/share/man/man1/@UNISON_SELF at .1.gz usr/share/man/man1/@UNISON_SELF_ALTERNATIVE at .1.gz
-usr/share/man/man1/@UNISON_SELF at .1.gz usr/share/man/man1/@UNISON_SELF_VERSIONNO at .1.gz
+usr/share/man/man1/@UNISON_SELF at .1.gz usr/share/man/man1/@UNISON_SELF_ALTERNATIVE at .1.gz
+usr/share/man/man1/@UNISON_SELF at .1.gz usr/share/man/man1/@UNISON_SELF_VERSIONNO at .1.gz
diff --git a/debian/templates/manpages b/debian/templates/manpages
index 6fdba74..91c0c9c 100644
--- a/debian/templates/manpages
+++ b/debian/templates/manpages
@@ -1 +1 @@
-debian/@UNISON_SELF at .1
+debian/@UNISON_SELF at .1
diff --git a/debian/templates/postinst b/debian/templates/postinst
index 5d643d5..723cc45 100644
--- a/debian/templates/postinst
+++ b/debian/templates/postinst
@@ -5,13 +5,13 @@ 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 at .1.gz
+ --slave /usr/share/man/man1/unison-gtk.1.gz unison-gtk.1.gz /usr/share/man/man1/@UNISON_GTK_ALTERNATIVE at .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 at .1.gz
+ --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON_GTK_ALTERNATIVE at .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 at .1.gz
+ --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON_ALTERNATIVE at .1.gz
fi
#DEBHELPER#
diff --git a/debian/utils/purify_unison b/debian/utils/purify_unison
index fa63d3c..d56afe7 100755
--- a/debian/utils/purify_unison
+++ b/debian/utils/purify_unison
@@ -4,7 +4,7 @@ PACKAGE=unison
VERSION=$2
ORIG=$1
-set -e
+set -e
if test -d $PACAKGE-$VERSION; then
echo "Directory $PACKAGE-$VERSION exists"
--
unison packaging
More information about the Pkg-ocaml-maint-commits
mailing list