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

Bug#761628: libxdmcp-dev: arch-dependent file in "Multi-Arch: same" package



user helmutg@debian.org
usertags 761628 + rebootstrap
tags 761628 + patch
thanks

On Mon, Sep 15, 2014 at 10:43:58AM +0200, Julien Cristau wrote:
> Presumably the new ports built against a newer version of
> xorg-sgml-doctools.

doc/xdmcp.xml uses &fullrelver;, which is set by xorg-sgml-doctools (or
some of its dependencies). I don't think it makes sense to include that
build-time information in the documentation, so I suggest to just remove
it. A patch achieving that is attached.

Adding Keith Packard to CC, because he authored the patched file. Maybe
that makes upstreaming this change faster.

Since this bug makes libxaw FTCBFS a timely solution is appreciated.

Helmut
diff -u libxdmcp-1.1.1/debian/changelog libxdmcp-1.1.1/debian/changelog
--- libxdmcp-1.1.1/debian/changelog
+++ libxdmcp-1.1.1/debian/changelog
@@ -1,3 +1,12 @@
+libxdmcp (1:1.1.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove &fullrelver; usage from doc/xdmcp.xml to make libxdmcp-dev M-A:same
+    safe when built with different versions of xorg-sgml-doctools. (closes:
+    #761628)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 01 Oct 2014 07:22:26 +0200
+
 libxdmcp (1:1.1.1-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- libxdmcp-1.1.1.orig/doc/xdmcp.xml
+++ libxdmcp-1.1.1/doc/xdmcp.xml
@@ -23,7 +23,7 @@
 <bookinfo>
    <title>X Display Manager Control Protocol</title>
    <subtitle>X.Org Standard</subtitle>
-   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>X Version 11</releaseinfo>
    <releaseinfo>Version 1.1</releaseinfo>
    <authorgroup>
    <author>

Reply to: