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

Bug#761628: libxdmcp: diff for NMU version 1:1.1.2-1.1



Control: tags 761628 + pending
Control: tags 783223 + pending

Hi X Strike Force,

I've prepared an NMU for libxdmcp (versioned as 1:1.1.2-1.1) and
uploaded it to DELAYED/15. It fixes the two multiarch and reproducible
bugs mentioned above. Please feel free to tell me if I should delay it
longer. The diff is attached.

Helmut
diff -u libxdmcp-1.1.2/debian/changelog libxdmcp-1.1.2/debian/changelog
--- libxdmcp-1.1.2/debian/changelog
+++ libxdmcp-1.1.2/debian/changelog
@@ -1,3 +1,14 @@
+libxdmcp (1:1.1.2-1.1) unstable; 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)
+  * Make usr/share/doc/libxdmcp-dev/xdmcp.txt.gz reproducible in the presence
+    of locales by exporting LC_ALL (closes: #783223).
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 11 Nov 2015 20:09:26 +0100
+
 libxdmcp (1:1.1.2-1) unstable; urgency=medium
 
   * Let uscan verify tarball signatures.
diff -u libxdmcp-1.1.2/debian/rules libxdmcp-1.1.2/debian/rules
--- libxdmcp-1.1.2/debian/rules
+++ libxdmcp-1.1.2/debian/rules
@@ -10,6 +10,9 @@
 # set this to the name of the main shlib's binary package
 PACKAGE = libxdmcp6
 
+# generation of usr/share/doc/libxdmcp-dev/xdmcp.txt.gz is locale dependent
+export LC_ALL=C.UTF-8
+
 .PHONY: build
 build:
 	dh build --with quilt,autoreconf --builddirectory=build/ --parallel
only in patch2:
unchanged:
--- libxdmcp-1.1.2.orig/doc/xdmcp.xml
+++ libxdmcp-1.1.2/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: