Hi,

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

 mecab (0.96-1.1) unstable; urgency=medium

   * Non-maintainer upload.
   * Add '90_gcc-4.3_support.diff' to fix FTBFS with GCC 4.3. Patch by
     Maximiliano Curia <[EMAIL PROTECTED]> (Closes: #461727)
   * debian/control:
     - Bump Standards-Version to 3.7.3.
     - Use ${binary:Version} instead of ${Source-Version}.


Regards,

-- 
Chris Lamb, UK                                       [EMAIL PROTECTED]
                                                            GPG: 0x634F9A20
diff -Nru mecab-0.96/debian/changelog mecab-0.96/debian/changelog
--- mecab-0.96/debian/changelog 2008-04-24 18:21:12.000000000 +0100
+++ mecab-0.96/debian/changelog 2008-04-24 18:21:12.000000000 +0100
@@ -1,3 +1,13 @@
+mecab (0.96-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add '90_gcc-4.3_support.diff' to fix FTBFS with GCC 4.3 (Closes: #461727)
+  * debian/control:
+    - Bump Standards-Version to 3.7.3.
+    - Use ${binary:Version} instead of ${Source-Version}.
+
+ -- Chris Lamb <[EMAIL PROTECTED]>  Thu, 24 Apr 2008 18:15:55 +0100
+
 mecab (0.96-1) unstable; urgency=low
 
   * New upstream.
diff -Nru mecab-0.96/debian/control mecab-0.96/debian/control
--- mecab-0.96/debian/control   2008-04-24 18:21:12.000000000 +0100
+++ mecab-0.96/debian/control   2008-04-24 18:21:12.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: TSUCHIYA Masatoshi <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>> 4.0.0), cdbs, libtool, automake1.4, autoconf
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: mecab
 Architecture: any
@@ -35,7 +35,7 @@
 Package: libmecab-dev
 Section: libdevel
 Architecture: any
-Depends: libmecab1 (= ${Source-Version})
+Depends: libmecab1 (= ${binary:Version})
 Description: Header files of Mecab
  This package provides header files which are necessary to development
  programs using runtime libraries of Mecab, that is a Japanese
diff -Nru mecab-0.96/debian/patches/90_gcc-4.3_support.diff 
mecab-0.96/debian/patches/90_gcc-4.3_support.diff
--- mecab-0.96/debian/patches/90_gcc-4.3_support.diff   1970-01-01 
01:00:00.000000000 +0100
+++ mecab-0.96/debian/patches/90_gcc-4.3_support.diff   2008-04-24 
18:21:12.000000000 +0100
@@ -0,0 +1,29 @@
+#DPATCHLEVEL=1
+--- mecab-0.96.orig/src/param.h        2007-03-11 10:34:16.000000000 -0300
++++ mecab-0.96/src/param.h     2008-04-06 00:46:43.000000000 -0300
+@@ -14,6 +14,16 @@
+ #include "scoped_ptr.h"
+ #include "common.h"
+ 
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
++
+ namespace MeCab {
+ 
+   template <class Target, class Source>
+@@ -29,7 +39,7 @@
+   }
+ 
+   template <>
+-  static std::string lexical_cast<std::string, std::string>(std::string arg) {
++  STATIC std::string lexical_cast<std::string, std::string>(std::string arg) {
+     return arg;
+   }
+ 

Attachment: signature.asc
Description: PGP signature

Reply via email to