[Pkg-ocaml-maint-commits] r1366 - trunk/packages/unison/branches/sarge/debian
Sylvain LE GALL
gildor-guest@costa.debian.org
Sun, 08 May 2005 15:21:26 +0000
Author: gildor-guest
Date: 2005-05-08 15:21:25 +0000 (Sun, 08 May 2005)
New Revision: 1366
Added:
trunk/packages/unison/branches/sarge/debian/watch
Modified:
trunk/packages/unison/branches/sarge/debian/changelog
trunk/packages/unison/branches/sarge/debian/control
trunk/packages/unison/branches/sarge/debian/rules
trunk/packages/unison/branches/sarge/debian/unison.doc-base
trunk/packages/unison/branches/sarge/debian/unison.docs
Log:
Fix for the RC bug of unison in sarge -- SLG
Modified: trunk/packages/unison/branches/sarge/debian/changelog
===================================================================
--- trunk/packages/unison/branches/sarge/debian/changelog 2005-05-08 14:37:04 UTC (rev 1365)
+++ trunk/packages/unison/branches/sarge/debian/changelog 2005-05-08 15:21:25 UTC (rev 1366)
@@ -1,3 +1,37 @@
+unison (2.9.1-2.sarge.1) testing-proposed-updates; urgency=high
+
+ * Release made by sponsor (Robert McQueen) and reviewed by maintainer
+ (Sylvain Le Gall)
+
+ * Merge the 2.9.1-2.1 NMU patch and upload to testing-proposed-updates to fix
+ the FTBFS in sarge, because the 2.10.2 upload prevented it from reaching
+ testing. (Closes: #304124)
+
+ * debian/unison-manual.{html,ps}:
+ - remove because they were obtained from the upstream website, and they
+ apparently have no license or source
+
+ * debian/unison.doc{s,-base}:
+ - remove mention of the HTML and PostScript manuals
+
+ * Use the watch file provided in unison2.9.1
+
+ * Use a substvars to add dependency on ocaml-base when we are compiling for
+ non-native arch (since we will need ocamlrun to run the program)
+
+ -- Robert McQueen <robot101@debian.org> Sun, 8 May 2005 10:20:30 +0100
+
+unison (2.9.1-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Updated build-dependency from ocaml-nox-3.08 to ocaml-nox-3.08.3
+ as suggested by Aurelien Jarno. Closes: #304124 (which is release
+ critical, hence the high urgency).
+ * Changed debian/unison.doc-base to refer to unison-manual.txt instead
+ of unison-manual.text.
+
+ -- Lars Wirzenius <liw@iki.fi> Sat, 30 Apr 2005 17:13:00 +0300
+
unison (2.9.1-2) unstable; urgency=medium
* Version to fix maintainer fields
Modified: trunk/packages/unison/branches/sarge/debian/control
===================================================================
--- trunk/packages/unison/branches/sarge/debian/control 2005-05-08 14:37:04 UTC (rev 1365)
+++ trunk/packages/unison/branches/sarge/debian/control 2005-05-08 15:21:25 UTC (rev 1366)
@@ -2,12 +2,12 @@
Section: net
Priority: optional
Maintainer: Sylvain Le Gall <sylvain.le-gall@polytechnique.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08, liblablgtk-ocaml-dev, dpatch, chrpath
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, liblablgtk-ocaml-dev, dpatch, chrpath
Standards-Version: 3.6.1.0
Package: unison
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${interpreter:Depends}
Recommends: ssh
Description: A file-synchronization tool for Unix and Windows
Unison is a file-synchronization tool for Unix and Windows, written
@@ -31,7 +31,7 @@
Package: unison-gtk
Architecture: any
-Depends: ${shlibs:Depends}, unison (= ${Source-Version})
+Depends: ${shlibs:Depends}, unison (= ${Source-Version}), ${interpreter:Depends}
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/branches/sarge/debian/rules
===================================================================
--- trunk/packages/unison/branches/sarge/debian/rules 2005-05-08 14:37:04 UTC (rev 1365)
+++ trunk/packages/unison/branches/sarge/debian/rules 2005-05-08 15:21:25 UTC (rev 1366)
@@ -54,9 +54,16 @@
dh_installmenu
dh_installman debian/unison.1
dh_installchangelogs NEWS
-# only strip it if it's native or it breaks
- if [ "$(NATIVE)" = "true" ]; then \
- dh_strip; \
+# Strip it if it's native or it breaks, add dependency on ocamlrun
+ if [ "x$(NATIVE)" = "xtrue" ]; then\
+ for i in debian/*.substvars; do \
+ echo "interpreter:Depends=" >> $$i;\
+ done;\
+ dh_strip -a;\
+ else\
+ for i in debian/*.substvars; do \
+ echo "interpreter:Depends=ocaml-base-3.08.3" >> $$i;\
+ done;\
fi
dh_compress
dh_fixperms
Modified: trunk/packages/unison/branches/sarge/debian/unison.doc-base
===================================================================
--- trunk/packages/unison/branches/sarge/debian/unison.doc-base 2005-05-08 14:37:04 UTC (rev 1365)
+++ trunk/packages/unison/branches/sarge/debian/unison.doc-base 2005-05-08 15:21:25 UTC (rev 1366)
@@ -9,12 +9,5 @@
other. This manual describes how to install and use Unison.
Section: Apps/Tools
-Format: postscript
-Files: /usr/share/doc/unison/unison-manual.ps.gz
-
Format: text
-Files: /usr/share/doc/unison/unison-manual.text.gz
-
-Format: HTML
-Index: /usr/share/doc/unison/unison-manual.html
-Files: /usr/share/doc/unison/unison-manual.html
+Files: /usr/share/doc/unison/unison-manual.txt.gz
Modified: trunk/packages/unison/branches/sarge/debian/unison.docs
===================================================================
--- trunk/packages/unison/branches/sarge/debian/unison.docs 2005-05-08 14:37:04 UTC (rev 1365)
+++ trunk/packages/unison/branches/sarge/debian/unison.docs 2005-05-08 15:21:25 UTC (rev 1366)
@@ -1,5 +1,3 @@
BUGS.txt
TODO.txt
unison-manual.txt
-debian/unison-manual.html
-debian/unison-manual.ps
Added: trunk/packages/unison/branches/sarge/debian/watch
===================================================================
--- trunk/packages/unison/branches/sarge/debian/watch 2005-05-08 14:37:04 UTC (rev 1365)
+++ trunk/packages/unison/branches/sarge/debian/watch 2005-05-08 15:21:25 UTC (rev 1366)
@@ -0,0 +1,2 @@
+version=3
+http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-(2.9.[0-9\.]*)/THIS-IS-UNISON-([0-9\.]*)