Hi Yooseong,
On Sat, Oct 06, 2007 at 09:04:33AM +0900, Yooseong Yang wrote:
>
> OK. I'll check it out and apply the patch to this package.
If you want to prepare a package, the attached patch is probably more
useful, as it also includes the changes to adapt to dpatch system.
Ming
2007.10.05
=== debian/control
==================================================================
--- debian/control (revision 399)
+++ debian/control (revision 400)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Yooseong Yang <[EMAIL PROTECTED]>
Uploaders: Ming Hua <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.1), autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6-1), libhangul-dev (>= 0.0.4)
+Build-Depends: debhelper (>= 4.0.1), dpatch, autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6-1), libhangul-dev (>= 0.0.4)
Standards-Version: 3.7.2.2
Package: scim-hangul
=== debian/changelog
==================================================================
--- debian/changelog (revision 399)
+++ debian/changelog (revision 400)
@@ -1,3 +1,13 @@
+scim-hangul (0.3.1-2) UNRELEASED; urgency=low
+
+ * Reintroduce dpatch system. Add dpatch to build dependency, include
+ /usr/share/dpatch/dpatch.make in debian/rules, and adjust debian/rules
+ accordingly.
+ * Add 10_missing-header dpatch, include <cstring> header and fix FTBFS with
+ GCC 4.3. (Closes: #441591)
+
+ -- Ming Hua <[EMAIL PROTECTED]> Tue, 02 Oct 2007 11:03:35 -0500
+
scim-hangul (0.3.1-1) unstable; urgency=low
* New upstream release, thanks to Anho Ki's help. (Closes: #432926)
=== debian/patches (new directory)
==================================================================
=== debian/patches/10_missing-header.dpatch
==================================================================
--- debian/patches/10_missing-header.dpatch (revision 399)
+++ debian/patches/10_missing-header.dpatch (revision 400)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_missing-header.dpatch by Ming Hua <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+##
+## DP: Adding missing header inclusions to fix FTBFS with GCC 4.3.
+
[EMAIL PROTECTED]@
+diff -urNad scim-hangul-0.3.1~/src/scim_hangul_imengine.cpp scim-hangul-0.3.1/src/scim_hangul_imengine.cpp
+--- scim-hangul-0.3.1~/src/scim_hangul_imengine.cpp 2007-01-06 08:00:57.000000000 -0600
++++ scim-hangul-0.3.1/src/scim_hangul_imengine.cpp 2007-10-02 11:29:06.000000000 -0500
+@@ -28,6 +28,7 @@
+ #define Uses_SCIM_IMENGINE
+ #define Uses_SCIM_LOOKUP_TABLE
+ #define Uses_SCIM_CONFIG_BASE
++#define Uses_C_STRING
+
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+diff -urNad scim-hangul-0.3.1~/src/scim_hangul_imengine_setup.cpp scim-hangul-0.3.1/src/scim_hangul_imengine_setup.cpp
+--- scim-hangul-0.3.1~/src/scim_hangul_imengine_setup.cpp 2006-10-23 07:42:47.000000000 -0500
++++ scim-hangul-0.3.1/src/scim_hangul_imengine_setup.cpp 2007-10-02 11:29:06.000000000 -0500
+@@ -27,6 +27,7 @@
+ */
+
+ #define Uses_SCIM_CONFIG_BASE
++#define Uses_C_STRING
+
+ #include <gtk/gtk.h>
+
Property changes on: debian/patches/10_missing-header.dpatch
___________________________________________________________________
Name: svn:executable
+*
=== debian/patches/00list
==================================================================
--- debian/patches/00list (revision 399)
+++ debian/patches/00list (revision 400)
@@ -0,0 +1 @@
+10_missing-header.dpatch
=== debian/rules
==================================================================
--- debian/rules (revision 399)
+++ debian/rules (revision 400)
@@ -5,6 +5,9 @@
#
# This file is distributed under the same license as scim-hangul.
+# include dpatch's ruleset
+include /usr/share/dpatch/dpatch.make
+
# uncomment this to turn on verbose mode
#export DH_VERBOSE = 1
@@ -30,7 +33,8 @@
CXXFLAGS += -O0
endif
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -42,7 +46,7 @@
dh_clean
-config.status:
+config.status: $(DPATCH_STAMPFN)
dh_testdir
# link config.{guess,sub} from autotools-dev package
ln -sf /usr/share/misc/config.guess config.guess
@@ -91,6 +95,6 @@
# no architecture independent packages
.SUFFIXES:
-.PHONY: clean build binary binary-arch binary-indep
+.PHONY: clean build binary binary-arch binary-indep patch unpatch clean-patched
# vim:textwidth=0:
