Bug#554185: mtink: diff for NMU version 1.0.16-1.1

[Stefano Zacchiroli]

tags 534040 + patch pending
tags 554185 + patch pending
thanks

Hi Sylvain,
  in my RC-squashing quest, I've stumbled upon mtink (hinted by your VAC
message in which you said you welcome NMUs, of course :-)). So I've
prepared an NMU for mtink (versioned as 1.0.16-1.1) and uploaded it to
DELAYED/7. The patch is attached and fixes both outstanding RC issues:

- the lack of a required manpage was due to an implicit po4a translation
  threshold (I presume it was not there before): you might want to tune
  per-page threshold, but note that some include files (e.g. the license
  statement) will most likely _always_ need a threshold of 0
- the missing build-dep on po-debconf was actually missing

Lintian complains about various other packaging issues, but I haven't
fixed more of them to avoid being too intrusive with this NMU.

Cheers (and enjoy your VAC!).

--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..|  .  |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime

---

diff -u mtink-1.0.16/debian/changelog mtink-1.0.16/debian/changelog
--- mtink-1.0.16/debian/changelog
+++ mtink-1.0.16/debian/changelog
@@ -1,3 +1,13 @@
+mtink (1.0.16-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: add missing build-dep on po-debconf (Closes: #554185)
+  * debian/mk/docbook-manpage.mk: fix shell test error ('==' operator)
+  * debian/rules: remove po threshold to avoid lacking manpages that are
+    assummed to be available, fix FTBFS. (Closes: #534040)
+
+ -- Stefano Zacchiroli <zack@...>  Wed, 04 Nov 2009 10:02:20 +0100
+
 mtink (1.0.16-1) unstable; urgency=low
 
   * New upstream release
diff -u mtink-1.0.16/debian/rules mtink-1.0.16/debian/rules
--- mtink-1.0.16/debian/rules
+++ mtink-1.0.16/debian/rules
@@ -40,6 +40,7 @@
 DEB_INSTALL_DOCS_ALL        :=
 
 PO4A_SOURCES := $(CURDIR)/debian/xml-man/po4a/po4a.cfg
+PO4A_BUILD_FLAGS += -k 0
 
 DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/askPrinter.xml \
                            $(CURDIR)/debian/xml-man/en/mtinkc.xml     \
diff -u mtink-1.0.16/debian/control mtink-1.0.16/debian/control
--- mtink-1.0.16/debian/control
+++ mtink-1.0.16/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Sylvain Le Gall <gildor@...>
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, patchutils (>= 0.2.25), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc,
  lesstif2-dev, libgimp2.0-dev (>= 2.0.0-4), libx11-dev,
- libxpm-dev, libxt-dev
+ libxpm-dev, libxt-dev, po-debconf
 Standards-Version: 3.7.2
 
 Package: mtink
diff -u mtink-1.0.16/debian/mk/docbook-manpage.mk mtink-1.0.16/debian/mk/docbook-manpage.mk
--- mtink-1.0.16/debian/mk/docbook-manpage.mk
+++ mtink-1.0.16/debian/mk/docbook-manpage.mk
@@ -67,7 +67,7 @@
 debian/control::
  if test -f $(CURDIR)/debian/control && test -f $(CURDIR)/debian/control.in; then \
   DOCBOOK_MANPAGE_VERSION=$(strip $(DOCBOOK_MANPAGE_VERSION)); \
-  if test "x$$DOCBOOK_MANPAGE_VERSION" == "x" && \
+  if test "x$$DOCBOOK_MANPAGE_VERSION" = "x" && \
      test "x$(strip $(DOCBOOK_MANPAGE_SOURCES))" != "x"; then \
     DOCBOOK_ALL_SOURCES="$(DOCBOOK_MANPAGE_SOURCES) $(DOCBOOK_MANPAGE_EXTRA_SOURCES)"; \
     DOCBOOK_MANPAGE_VERSION=`grep -s -e "-//OASIS//DTD DocBook XML V[0-9\.]*//EN" $$DOCBOOK_ALL_SOURCES | \

---

[Debian Bug Tracking System]

Processing commands for control@...:

> tags 534040 + patch pending
Bug #534040 [mtink] mtink: FTBFS: make[1]: *** No rule to make target `/build/user-mtink_1.0.16-1-amd64-Xe4iui/mtink-1.0.16/debian/xml-man/fr/askPrinter.xml.docbook-manpage-check'. Stop.
Added tag(s) pending and patch.
> tags 554185 + patch pending
Bug #554185 [mtink] mtink: missing-build-dependency po-debconf
Added tag(s) pending and patch.
> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


--
To UNSUBSCRIBE, email to debian-bugs-rc-REQUEST@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...