[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

unison 2.9.1-2.sarge.1 NMU



I have prepared an NMU for unison 2.9.1-2 in sarge to fix the FTBFS bug
#304124, as well as removing the unlicensed unison-manual.html and
unison-manual.ps files which were obtained from the upstream website. It
is based on 2.9.1-2.1, which fixed the FTBFS in sid shortly before
2.10.2 was uploaded, preventing it from ever reaching sarge.

I also amended the clean target to remove win32 binary resource files
unison.res and unison.res.lib, but AFAICT it's not necessary to repack
the tarball to remove these, because the source (unison.rc) is provided
and it's trivial to regenerate the binaries from this with windres.

Interdiff between 2.9.1-2 and 2.9.1-2.sarge.1 is attached, although I've
filtered out the removal of the large unison-manual documents for
readability.

Changelog:
unison (2.9.1-2.sarge.1) testing-proposed-updates; urgency=high

 * Non-maintainer upload by sponsor. Upload the previous 2.9.1-2.1 NMU
    to testing-proposed-updates to fix the FTBFS in sarge, because the
    2.10.2 upload prevented it from reaching testing. (closes: #304124)

 * debian/rules:
    - remove binary objects (win32rc/unison.res{,.lib}) in the tarball
       in the clean target to guarantee that the binary build is
       reproducible

 * 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

Diffstat:
 changelog       |   31 +++++++++++++++++++++++++++++++
 control         |    2 +-
 rules           |    1 +
 unison.doc-base |    9 +--------
 unison.docs     |    2 --
 5 files changed, 34 insertions(+), 11 deletions(-)

I will upload in a few hours if nobody protests.

Regards,
Rob
diff -u unison-2.9.1/debian/unison.docs unison-2.9.1/debian/unison.docs
--- unison-2.9.1/debian/unison.docs
+++ unison-2.9.1/debian/unison.docs
@@ -4,2 +3,0 @@
-debian/unison-manual.html
-debian/unison-manual.ps
diff -u unison-2.9.1/debian/control unison-2.9.1/debian/control
--- unison-2.9.1/debian/control
+++ unison-2.9.1/debian/control
@@ -2,7 +2,7 @@
 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
reverted:
diff -u unison-2.9.1/debian/changelog unison-2.9.1/debian/changelog
--- unison-2.9.1/debian/changelog
+++ unison-2.9.1/debian/changelog
@@ -1,3 +1,34 @@
+unison (2.9.1-2.sarge.1) testing-proposed-updates; urgency=high
+
+  * Non-maintainer upload by sponsor. Upload the previous 2.9.1-2.1 NMU
+     to testing-proposed-updates to fix the FTBFS in sarge, because the 2.10.2
+     upload prevented it from reaching testing. (closes: #304124)
+
+  * debian/rules:
+     - remove binary objects (win32rc/unison.res{,.lib}) in the tarball
+        in the clean target to guarantee that the binary build is
+        reproducible
+
+  * 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
+
+ -- 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
diff -u unison-2.9.1/debian/unison.doc-base unison-2.9.1/debian/unison.doc-base
--- unison-2.9.1/debian/unison.doc-base
+++ unison-2.9.1/debian/unison.doc-base
@@ -12,9 +12,2 @@
-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
reverted:
diff -u unison-2.9.1/debian/rules unison-2.9.1/debian/rules
--- unison-2.9.1/debian/rules
+++ unison-2.9.1/debian/rules
@@ -32,6 +32,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -f unison-manual.txt unison-gtk
+	rm -f win32rc/unison.res win32rc/unison.res.lib
 	-$(MAKE) clean
 	dh_clean
 

Reply to: