Hi,
On Thu, Jul 04, 2013 at 08:00:23PM +0100, Adam D. Barratt wrote:
> Control: tags -1 + confirmed
>
> On Thu, 2013-07-04 at 22:40 +0900, Osamu Aoki wrote:
> > Wrong libexecdir breaking GUI menu.
> >
> > A part of ibus family package bug fixes.
>
> Please go ahead.
Thanks.
> The watch file change should be mentioned in the changelog (although I'm
> not entirely sure why it's included in a stable upload).
It seems I need to be more conservative for the stable updates. (This is
my first stable updates.)
Let me drop the watch file change which is simpler. (One click with
gitk).
Updated patch attached as a record. I will be uploading this updated
package.
Regards,
Osamu
diff -Nru ibus-sunpinyin-2.0.3/debian/changelog
ibus-sunpinyin-2.0.3/debian/changelog
--- ibus-sunpinyin-2.0.3/debian/changelog 2013-07-04 21:38:29.000000000
+0900
+++ ibus-sunpinyin-2.0.3/debian/changelog 2013-07-04 21:41:58.000000000
+0900
@@ -1,3 +1,10 @@
+ibus-sunpinyin (2.0.3-4+deb7u1) stable; urgency=low
+
+ * Team upload.
+ * Fix libexecdir. Closes: #712583
+
+ -- Osamu Aoki <[email protected]> Sat, 29 Jun 2013 15:13:27 +0900
+
ibus-sunpinyin (2.0.3-4) unstable; urgency=low
[YunQiang Su]
diff -Nru ibus-sunpinyin-2.0.3/debian/patches/libexecdir.patch
ibus-sunpinyin-2.0.3/debian/patches/libexecdir.patch
--- ibus-sunpinyin-2.0.3/debian/patches/libexecdir.patch 1970-01-01
09:00:00.000000000 +0900
+++ ibus-sunpinyin-2.0.3/debian/patches/libexecdir.patch 2013-07-04
21:41:58.000000000 +0900
@@ -0,0 +1,14 @@
+From: Osamu Aoki <[email protected]>
+Description: libexecdir should be shared with ibus-setup to work
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -74,7 +74,7 @@
+
+ data_dir = env['DATADIR'] + '/ibus-sunpinyin'
+ icons_dir = env['DATADIR'] + '/ibus-sunpinyin/icons'
+-bin_dir = env['LIBEXECDIR'] + '/ibus-sunpinyin'
++bin_dir = env['LIBEXECDIR'] + '/ibus'
+ gettext_package = 'ibus-sunpinyin'
+
+ extra_cflags = ' -DIBUS_SUNPINYIN_LOCALEDIR=\'"%s"\'' % (env['DATADIR'] +
'/locale')
diff -Nru ibus-sunpinyin-2.0.3/debian/patches/series
ibus-sunpinyin-2.0.3/debian/patches/series
--- ibus-sunpinyin-2.0.3/debian/patches/series 2013-07-04 21:38:29.000000000
+0900
+++ ibus-sunpinyin-2.0.3/debian/patches/series 2013-07-04 21:41:58.000000000
+0900
@@ -1 +1,2 @@
+libexecdir.patch
append-os-environ-toenv.patch
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rwxr-xr-x root/root /usr/lib/ibus/ibus-engine-sunpinyin
-rwxr-xr-x root/root /usr/lib/ibus/ibus-setup-sunpinyin
Files in first .changes but not in second
-----------------------------------------
-rwxr-xr-x root/root /usr/lib/ibus-sunpinyin/ibus-engine-sunpinyin
-rwxr-xr-x root/root /usr/lib/ibus-sunpinyin/ibus-setup-sunpinyin
Control files: lines which differ (wdiff format)
------------------------------------------------
Version: [-2.0.3-4-] {+2.0.3-4+deb7u1+}
