tags 521071 + patch
thanks
Dear maintainer,
I've prepared an NMU for stardict (versioned as 3.0.1-4.1) and
uploaded it to DELAYED/02. Please free to tell me if I should
delay it longer.
Regards.
--
.''`. Josselin Mouette
: :' :
`. `' “I recommend you to learn English in hope that you in
`- future understand things” -- Jörg Schilling
diff -u stardict-3.0.1/debian/changelog stardict-3.0.1/debian/changelog
--- stardict-3.0.1/debian/changelog
+++ stardict-3.0.1/debian/changelog
@@ -1,3 +1,11 @@
+stardict (3.0.1-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 06_new_gucharmap.dpatch: patch stolen from Ubuntu. Update StarDict
+ to work with the latest gucharmap. Closes: #521071.
+
+ -- Josselin Mouette <j...@debian.org> Sat, 25 Apr 2009 12:34:41 +0200
+
stardict (3.0.1-4) unstable; urgency=low
* debian/patches/05_g++-4.3.dpatch:
diff -u stardict-3.0.1/debian/control stardict-3.0.1/debian/control
--- stardict-3.0.1/debian/control
+++ stardict-3.0.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Andrew Lee <and...@linux.org.tw>
Uploaders: Anthony Fok <f...@debian.org>
-Build-Depends: debhelper (>= 5.0.51), dpatch, libgnomeui-dev, scrollkeeper, libbonobo2-dev, libgconf2-dev, liborbit2-dev, zlib1g-dev, sharutils, libxml-parser-perl, libx11-dev, x11proto-core-dev, libenchant-dev, libgucharmap-dev, libespeak-dev, festival-dev, libestools1.2-dev, libtool, intltool, autoconf, automake (>= 1.10), autotools-dev, libsigc++-2.0-dev (>= 2.0.18-2)
+Build-Depends: debhelper (>= 5.0.51), dpatch, libgnomeui-dev, scrollkeeper, libbonobo2-dev, libgconf2-dev, liborbit2-dev, zlib1g-dev, sharutils, libxml-parser-perl, libx11-dev, x11proto-core-dev, libenchant-dev, libgucharmap2-dev, libespeak-dev, festival-dev, libestools1.2-dev, libtool, intltool, autoconf, automake (>= 1.10), autotools-dev, libsigc++-2.0-dev (>= 2.0.18-2)
Build-Conflicts: autoconf2.13, automake1.4
Standards-Version: 3.8.0.0
DM-Upload-Allowed: yes
diff -u stardict-3.0.1/debian/patches/00list stardict-3.0.1/debian/patches/00list
--- stardict-3.0.1/debian/patches/00list
+++ stardict-3.0.1/debian/patches/00list
@@ -5,0 +6 @@
+06_new_gucharmap.dpatch
only in patch2:
unchanged:
--- stardict-3.0.1.orig/debian/patches/06_new_gucharmap.dpatch
+++ stardict-3.0.1/debian/patches/06_new_gucharmap.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_new_gucharmap.dpatch by Steve Kowalik <stev...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct pkg-config name for gucharmap, and correct some code changes
+## DP: with the new version of the library.
+
+...@dpatch@
+diff -urNad stardict-3.0.1~/configure.in stardict-3.0.1/configure.in
+--- stardict-3.0.1~/configure.in 2008-09-01 18:37:55.000000000 +1000
++++ stardict-3.0.1/configure.in 2008-09-01 18:37:56.000000000 +1000
+@@ -76,7 +76,7 @@
+ [enable_gucharmap=yes])
+
+ if test "x$enable_gucharmap" = "xyes" ; then
+- PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
++ PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
+ if test "x$have_gucharmap" = "xyes"; then
+ GUCHARMAP_CFLAGS="${GUCHARMAP_CFLAGS}"
+ GUCHARMAP_LIBS="${GUCHARMAP_LIBS}"
+diff -urNad stardict-3.0.1~/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
+--- stardict-3.0.1~/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-09-01 18:37:55.000000000 +1000
++++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-09-01 18:38:49.000000000 +1000
+@@ -237,7 +237,7 @@
+ /* canonical decomposition */
+ gunichar *decomposition;
+ gsize result_len;
+- decomposition = gucharmap_unicode_canonical_decomposition (uc, &result_len);
++ decomposition = g_unicode_canonical_decomposition (uc, &result_len);
+ if (result_len != 1) {
+ definition += _("Canonical decomposition:");
+ definition += " ";
