[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.40.63-2-3-g74ba8a7
The following commit has been merged in the master branch:
commit 85556fc03ddf2f3fbdb0a10c483b214ce6de622d
Author: Stephane Glondu st...@glondu.net
Date: Sat Mar 31 08:51:46 2012 +0200
Suggest unison-all
diff --git a/debian/control b/debian/control
index 494b855..59daf46 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: unison
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
@@ -49,6 +50,7 @@ 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
--
unison packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.40.63-2-3-g74ba8a7
The following commit has been merged in the master branch: commit 56e9159f72f5fbb3287bd1b1530e0e1fe08fc012 Author: Stephane Glondu st...@glondu.net Date: Sat Mar 31 08:54:24 2012 +0200 Use rsvg-convert instead of rsvg (Closes: #666312) diff --git a/debian/rules b/debian/rules index 29fdb42..052412f 100755 --- a/debian/rules +++ b/debian/rules @@ -126,7 +126,7 @@ common-binary-arch:: debian/unison-manual.txt debian/unison.1.in # debian/$(UNISON_GTK_PACKAGE).png: debian/unison-gtk.svg.in -rsvg -f png -w 32 -h 32 $^ $@ +rsvg-convert -f png -w 32 -h 32 -o $@ $^ debian/$(UNISON_GTK_PACKAGE).xpm: debian/$(UNISON_GTK_PACKAGE).png convert $^ $@ -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.40.63-2-3-g74ba8a7
The following commit has been merged in the master branch: commit 74ba8a781bdb8803d94c7b48b1cb00c3330a6157 Author: Stephane Glondu st...@glondu.net Date: Sat Mar 31 18:59:24 2012 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index c259eaf..57a9532 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +unison (2.40.63-3) unstable; urgency=low + + * Suggest unison-all + * Use rsvg-convert instead of rsvg (Closes: #666312) + + -- Stéphane Glondu glo...@debian.org Sat, 31 Mar 2012 19:16:19 +0200 + unison (2.40.63-2) unstable; urgency=low * Remove unison-gtk alternative on uninstall (Closes: #657420) -- unison packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
