[xml/sgml-commit] r1702 - in /packages/html-xml-utils/trunk/debian: README.source changelog control patches/ patches/585451_fix_ftbfs.patch patches/series rules

Mon Jun 14 21:09:36 UTC 2010

Author: dleidert-guest
Date: Mon Jun 14 21:09:30 2010
New Revision: 1702

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1702
Log:
* debian/control (Build-Depends): Added quilt.
* debian/rules: Ditto. Enable parallel builds.
* debian/README.source: Added because of quilt usage.
* debian/patches/585451_fix_ftbfs.patch: Added with thanks to Sebastian
  Andrzej Siewior.
  - hxindex.c (main): Fix an FTBFS on arches, where char is an unsigned char
    (closes: #585451).
* debian/patches/series: Adjusted accordingly.

Added:
    packages/html-xml-utils/trunk/debian/README.source
    packages/html-xml-utils/trunk/debian/patches/
    packages/html-xml-utils/trunk/debian/patches/585451_fix_ftbfs.patch
    packages/html-xml-utils/trunk/debian/patches/series
Modified:
    packages/html-xml-utils/trunk/debian/changelog
    packages/html-xml-utils/trunk/debian/control
    packages/html-xml-utils/trunk/debian/rules

Added: packages/html-xml-utils/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/README.source?rev=1702&op=file
==============================================================================

--- packages/html-xml-utils/trunk/debian/README.source (added)
+++ packages/html-xml-utils/trunk/debian/README.source Mon Jun 14 21:09:30 2010
@@ -1,0 +1,7 @@
+html-xml-utils source for Debian
+--------------------------------
+
+This package uses the `quilt' patch management solution. See
+/usr/share/doc/quilt/README.source.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Jun 2010

Modified: packages/html-xml-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/changelog?rev=1702&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/changelog (original)
+++ packages/html-xml-utils/trunk/debian/changelog Mon Jun 14 21:09:30 2010
@@ -1,6 +1,14 @@
 html-xml-utils (5.7-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * debian/control (Build-Depends): Added quilt.
+  * debian/rules: Ditto. Enable parallel builds.
+  * debian/README.source: Added because of quilt usage.
+  * debian/patches/585451_fix_ftbfs.patch: Added with thanks to Sebastian
+    Andrzej Siewior.
+    - hxindex.c (main): Fix an FTBFS on arches, where char is an unsigned char
+      (closes: #585451).
+  * debian/patches/series: Adjusted accordingly.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Wed, 12 May 2010 22:44:12 +0200
 

Modified: packages/html-xml-utils/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/control?rev=1702&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/control (original)
+++ packages/html-xml-utils/trunk/debian/control Mon Jun 14 21:09:30 2010
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>> 7), bison, flex, gperf, man2html
+Build-Depends: debhelper (>> 7), quilt (>= 0.46-7~), bison, flex, gperf, man2html
 Standards-Version: 3.8.4
 Homepage: http://www.w3.org/Tools/HTML-XML-utils/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/

Added: packages/html-xml-utils/trunk/debian/patches/585451_fix_ftbfs.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/585451_fix_ftbfs.patch?rev=1702&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/585451_fix_ftbfs.patch (added)
+++ packages/html-xml-utils/trunk/debian/patches/585451_fix_ftbfs.patch Mon Jun 14 21:09:30 2010
@@ -1,0 +1,30 @@
+From 1070038659a2bc8cdef8b3c847287e5281060ef5 Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
+Date: Thu, 10 Jun 2010 18:37:49 +0200
+Subject: [PATCH] hxindex: option is int not char
+
+the return value of getopt is int not char. The difference here is that
+char is signed char on x86 but unsigned char on powerpc for instance.
+This leads to the following compile error if compiled with -Wextra:
+
+| hxindex.c:777: warning: comparison is always true due to limited range  of data type
+
+because c can never get -1, it can however grow to 255 and the options
+will never be parsed properly.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
+---
+ hxindex.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/hxindex.c
++++ b/hxindex.c
+@@ -758,7 +758,7 @@
+   Boolean write = True;
+   Indexterm termtree = NULL;	/* Sorted tree of terms */
+   string secno;
+-  char c;
++  int c;
+ 
+   /* Bind the parser callback routines to our handlers */
+   set_error_handler(handle_error);

Added: packages/html-xml-utils/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/series?rev=1702&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/series (added)
+++ packages/html-xml-utils/trunk/debian/patches/series Mon Jun 14 21:09:30 2010
@@ -1,0 +1,1 @@
+585451_fix_ftbfs.patch

Modified: packages/html-xml-utils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/rules?rev=1702&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/rules (original)
+++ packages/html-xml-utils/trunk/debian/rules Mon Jun 14 21:09:30 2010
@@ -6,4 +6,4 @@
 LDFLAGS = -Wl,-z,defs
 
 %:
-	dh $@
+	dh --with quilt --parallel $@


