Bug#474869: kchmviewer: diff for NMU version 3.1-1.1

[Chris Lamb]

Hi,

The attached file is the diff for my kchmviewer 3.1-1.1 NMU. The associated
changelog entry is:

  kchmviewer (3.1-1.1) unstable; urgency=medium

   * Non-maintainer upload.
   * Bump Standards-Version to 3.7.3.
   * Correct typographical error in package description (Gnome -> GNOME)
   * Fix FTBFS with GCC 4.3 (Closes: #474869)
   * Correct debian/watch file to report upstream version correctly
     (Closes: #449696)


Regards,

-- 
Chris Lamb, UK                                       [EMAIL PROTECTED]
                                                            GPG: 0x634F9A20

diff -u kchmviewer-3.1/debian/control kchmviewer-3.1/debian/control
--- kchmviewer-3.1/debian/control
+++ kchmviewer-3.1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jose Luis Tallon <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.2.0), kdelibs4-dev, libchm-dev, autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: kchmviewer
 Architecture: any
@@ -11,7 +11,7 @@
 Description: CHM viewer for KDE
  KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
  Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
- library, and does not depend on KDE or Gnome. However, it may be compiled
+ library, and does not depend on KDE or GNOME. However, it may be compiled
  with full KDE support, including KDE widgets and KIO/KHTML. 
  .
  The main advantage of KchmViewer is non-English language support. Unlike
diff -u kchmviewer-3.1/debian/watch kchmviewer-3.1/debian/watch
--- kchmviewer-3.1/debian/watch
+++ kchmviewer-3.1/debian/watch
@@ -1,2 +1,2 @@
-version=2
-http://prdownloads.sourceforge.net/kchmviewer/kchmviewer-?([\w+\d+\.]+|\d+)(?:\.tar|\.tgz)(?:\.gz|\.bz2|)
 debian uupdate
+version=3
+http://sf.net/kchmviewer/kchmviewer-?([\w+\d+\.]+|\d+)(?:\.tar|\.tgz)(?:\.gz|\.bz2|)
 debian uupdate
diff -u kchmviewer-3.1/debian/changelog kchmviewer-3.1/debian/changelog
--- kchmviewer-3.1/debian/changelog
+++ kchmviewer-3.1/debian/changelog
@@ -1,3 +1,14 @@
+kchmviewer (3.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Bump Standards-Version to 3.7.3.
+  * Correct typographical error in package description (Gnome -> GNOME)
+  * Fix FTBFS with GCC 4.3 (Closes: #474869)
+  * Correct debian/watch file to report upstream version correctly
+    (Closes: #449696)
+
+ -- Chris Lamb <[EMAIL PROTECTED]>  Thu, 24 Apr 2008 17:49:30 +0100
+
 kchmviewer (3.1-1) unstable; urgency=low
 
   * New upstream version (Closes: #428128)
only in patch2:
unchanged:
--- kchmviewer-3.1.orig/lib/libchmfile/libchmfileimpl.h
+++ kchmviewer-3.1/lib/libchmfile/libchmfileimpl.h
@@ -25,6 +25,8 @@
 #include "libchmfile.h"
 #include "libchmtocimage.h"
 
+#include <sys/types.h> /* for u_int{32,64}_t */
+
 //! Keeps the intermediate search result
 class LCHMSearchProgressResult
 {

signature.asc
Description: PGP signature