Source: uim Version: 1:1.8.6-10 Forwarded: https://github.com/uim/uim/pull/48
Dear uim maintainers, I am attaching the patch that ports uim to the new libpanel-applet API, so that it is compatible with gnome-panel 3.14 and newer releases. The upstream part of this patch is already committed to their Git, but is not yet part of any upstream release. New gnome-panel is so far only available in experimental, but we are going to upload it to unstable at some point (it will be a transition coordinated with Release Team). You do not need to apply this patch right now, but feel free to review it and/or upload the patched version to experimental. -- Dmitry Shachnev
diff -Nru uim-1.8.6/debian/changelog uim-1.8.6/debian/changelog --- uim-1.8.6/debian/changelog 2015-06-08 05:22:43.000000000 +0300 +++ uim-1.8.6/debian/changelog 2015-06-17 11:31:37.000000000 +0300 @@ -1,3 +1,10 @@ +uim (1:1.8.6-10.1) UNRELEASED; urgency=medium + + * Port to GAction and libpanel-applet 3.14. + - Autoreconf fails, so patch configure and Makefile.am directly. + + -- Dmitry Shachnev <[email protected]> Wed, 17 Jun 2015 11:30:33 +0300 + uim (1:1.8.6-10) unstable; urgency=medium * fix stuck messages to uim-input-pad-ja (Closes: #787824). diff -Nru uim-1.8.6/debian/control uim-1.8.6/debian/control --- uim-1.8.6/debian/control 2015-06-05 15:39:23.000000000 +0300 +++ uim-1.8.6/debian/control 2015-06-17 11:28:36.000000000 +0300 @@ -25,7 +25,7 @@ libgtk-3-dev, libncurses5-dev, libm17n-dev, - libpanel-applet-4-dev, + libpanel-applet-dev, libpango1.0-dev, libqt4-dev (>= 4:4.8.0), libx11-dev, diff -Nru uim-1.8.6/debian/patches/libpanel-applet.patch uim-1.8.6/debian/patches/libpanel-applet.patch --- uim-1.8.6/debian/patches/libpanel-applet.patch 1970-01-01 03:00:00.000000000 +0300 +++ uim-1.8.6/debian/patches/libpanel-applet.patch 2015-06-17 11:32:44.000000000 +0300 @@ -0,0 +1,437 @@ +Description: port to GAction and libpanel-applet 3.14 +Origin: upstream, https://github.com/uim/uim/commit/9a37a41b1ac24d27 +Last-Update: 2015-06-17 + +--- a/configure.ac ++++ b/configure.ac +@@ -898,12 +898,12 @@ + use_applet_gnome3="no" + ;; + yes|*) +- PKG_CHECK_MODULES(APPLET_GNOME3, libpanelapplet-4.0, use_applet_gnome3="yes",use_applet_gnome3="no") ++ PKG_CHECK_MODULES(APPLET_GNOME3, libpanel-applet, use_applet_gnome3="yes",use_applet_gnome3="no") + ;; + esac + ], + [ +- PKG_CHECK_MODULES(APPLET_GNOME3, libpanelapplet-4.0, use_applet_gnome3="yes",use_applet_gnome3="no") ++ PKG_CHECK_MODULES(APPLET_GNOME3, libpanel-applet, use_applet_gnome3="yes",use_applet_gnome3="no") + ]) + + dnl **************************** +--- a/gtk3/toolbar/Makefile.am ++++ b/gtk3/toolbar/Makefile.am +@@ -1,4 +1,5 @@ + EXTRA_DIST = UimApplet.panel-applet.in.in \ ++ uim-applet-menu.xml \ + org.gnome.panel.applet.UimAppletFactory.service.in + + if APPLET_GNOME3 +@@ -6,11 +7,15 @@ + + libexec_PROGRAMS = uim-toolbar-applet-gnome3 + ++xmluidir = $(pkgdatadir)/ui ++xmlui_DATA = uim-applet-menu.xml ++ + uim_toolbar_applet_gnome3_LDADD = @GTK3_LIBS@ @APPLET_GNOME3_LIBS@ \ + $(top_builddir)/uim/libuim-scm.la \ + $(top_builddir)/uim/libuim.la \ + $(top_builddir)/uim/libuim-custom.la + uim_toolbar_applet_gnome3_CPPFLAGS = \ ++ -DUIM_UIDATADIR="\"${xmluidir}\"" \ + $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + + uim_toolbar_applet_gnome3_CFLAGS = @GTK3_CFLAGS@ @APPLET_GNOME3_CFLAGS@ +@@ -18,7 +23,7 @@ + uim_toolbar_applet_gnome3_SOURCES = applet-gnome3.c \ + ../../gtk2/toolbar/common-gtk.c + +-appletdir = $(datadir)/gnome-panel/4.0/applets ++appletdir = $(datadir)/gnome-panel/5.0/applets + applet_DATA = UimApplet.panel-applet + applet_in_files = $(applet_DATA:=.in) + applet_in_in_files = $(applet_in_files:=.in) +--- a/gtk3/toolbar/applet-gnome3.c ++++ b/gtk3/toolbar/applet-gnome3.c +@@ -44,83 +44,66 @@ + + PanelApplet *uimapplet; + +-static void exec_switcher(GtkAction *action, gpointer data); +-static void exec_pref(GtkAction *action, gpointer data); +-static void exec_dic(GtkAction *action, gpointer data); +-static void exec_pad(GtkAction *action, gpointer data); +-static void exec_hand(GtkAction *action, gpointer data); +-static void exec_help(GtkAction *action, gpointer data); +-static void display_about_dialog(GtkAction *action, gpointer data); ++static void exec_switcher(GSimpleAction *action, GVariant *parameter, gpointer data); ++static void exec_pref(GSimpleAction *action, GVariant *parameter, gpointer data); ++static void exec_dic(GSimpleAction *action, GVariant *parameter, gpointer data); ++static void exec_pad(GSimpleAction *action, GVariant *parameter, gpointer data); ++static void exec_hand(GSimpleAction *action, GVariant *parameter, gpointer data); ++static void exec_help(GSimpleAction *action, GVariant *parameter, gpointer data); ++static void display_about_dialog(GSimpleAction *action, GVariant *parameter, gpointer data); + + extern GtkWidget *uim_toolbar_applet_new(void); + extern void uim_toolbar_launch_helper_application(const char *command); + +- +-static const GtkActionEntry uim_menu_actions[] = { +- {"Switcher", "im_switcher", +- N_("Switch input method"), NULL, NULL, G_CALLBACK(exec_switcher)}, +- {"Pref", GTK_STOCK_PREFERENCES, +- N_("Preference"), NULL, NULL, G_CALLBACK(exec_pref)}, +- {"Dic", "uim-dict", +- N_("Japanese dictionary editor"), NULL, NULL, G_CALLBACK(exec_dic)}, +- {"Pad", GTK_STOCK_BOLD, +- N_("Input pad"), NULL, NULL, G_CALLBACK(exec_pad)}, +- {"Hand", GTK_STOCK_EDIT, +- N_("Handwriting input pad"), NULL, NULL, G_CALLBACK(exec_hand)}, +- {"Help", GTK_STOCK_HELP, +- N_("Help"), NULL, NULL, G_CALLBACK(exec_help)}, +- {"About", GTK_STOCK_ABOUT, +- N_("About"), NULL, NULL, G_CALLBACK(display_about_dialog)} ++static const GActionEntry uim_menu_actions[] = { ++ { "switcher", exec_switcher }, ++ { "pref", exec_pref }, ++ { "dic", exec_dic }, ++ { "pad", exec_pad }, ++ { "hand", exec_hand }, ++ { "help", exec_help }, ++ { "about", display_about_dialog } + }; + +-static const char uim_menu_xml[] = +- "<menuitem action=\"Switcher\"/>" +- "<menuitem action=\"Pref\"/>" +- "<menuitem action=\"Dic\"/>" +- "<menuitem action=\"Pad\"/>" +- "<menuitem action=\"Hand\"/>" +- "<menuitem action=\"Help\"/>" +- "<menuitem action=\"About\"/>"; +- + static void +-exec_switcher(GtkAction *action, gpointer data) ++exec_switcher(GSimpleAction *action, GVariant *parameter, gpointer data) + { + uim_toolbar_launch_helper_application("uim-im-switcher-gtk3"); + } + + static void +-exec_pref(GtkAction *action, gpointer data) ++exec_pref(GSimpleAction *action, GVariant *parameter, gpointer data) + { + uim_toolbar_launch_helper_application("uim-pref-gtk3"); + } + + static void +-exec_dic(GtkAction *action, gpointer data) ++exec_dic(GSimpleAction *action, GVariant *parameter, gpointer data) + { + uim_toolbar_launch_helper_application("uim-dict-gtk3"); + } + + static void +-exec_pad(GtkAction *action, gpointer data) ++exec_pad(GSimpleAction *action, GVariant *parameter, gpointer data) + { + uim_toolbar_launch_helper_application("uim-input-pad-ja-gtk3"); + } + + static void +-exec_hand(GtkAction *action, gpointer data) ++exec_hand(GSimpleAction *action, GVariant *parameter, gpointer data) + { + uim_toolbar_launch_helper_application("uim-tomoe-gtk"); + } + + static void +-exec_help(GtkAction *uic, gpointer data) ++exec_help(GSimpleAction *action, GVariant *parameter, gpointer data) + { + uim_toolbar_launch_helper_application("uim-help"); + } + + /* Just the about window... If it's already open, just focus it */ + static void +-display_about_dialog(GtkAction *action, gpointer data) ++display_about_dialog(GSimpleAction *action, GVariant *parameter, gpointer data) + { + GdkPixbuf *icon = NULL; + const gchar *authors[] = {"uim Project", NULL}; +@@ -149,7 +132,8 @@ + uim_applet_new(PanelApplet *applet, const gchar *iid, gpointer data) + { + GtkWidget *toolbar; +- GtkActionGroup *action_group; ++ GSimpleActionGroup *action_group; ++ gchar *ui_path; + + uimapplet = applet; + +@@ -164,11 +148,16 @@ + + gtk_widget_show_all(GTK_WIDGET(applet)); + +- action_group = gtk_action_group_new("uim Applet Actions"); +- gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); +- gtk_action_group_add_actions(action_group, uim_menu_actions, ++ action_group = g_simple_action_group_new(); ++ g_action_map_add_action_entries(G_ACTION_MAP (action_group), uim_menu_actions, + G_N_ELEMENTS(uim_menu_actions), toolbar); +- panel_applet_setup_menu(applet, uim_menu_xml, action_group); ++ ++ ui_path = g_build_filename (UIM_UIDATADIR, "uim-applet-menu.xml", NULL); ++ panel_applet_setup_menu_from_file(applet, ui_path, action_group, GETTEXT_PACKAGE); ++ g_free(ui_path); ++ ++ gtk_widget_insert_action_group (GTK_WIDGET (applet), "uim", ++ G_ACTION_GROUP (action_group)); + #if LIBPANEL_APPLET_HAVE_SET_BACKGROUND_WIDGET + panel_applet_set_background_widget(applet, GTK_WIDGET(applet)); + #endif +--- /dev/null ++++ b/gtk3/toolbar/uim-applet-menu.xml +@@ -0,0 +1,30 @@ ++<section> ++ <item> ++ <attribute name="label" translatable="yes">Switch input method</attribute> ++ <attribute name="action">uim.switcher</attribute> ++ </item> ++ <item> ++ <attribute name="label" translatable="yes">Preference</attribute> ++ <attribute name="action">uim.pref</attribute> ++ </item> ++ <item> ++ <attribute name="label" translatable="yes">Japanese dictionary editor</attribute> ++ <attribute name="action">uim.dic</attribute> ++ </item> ++ <item> ++ <attribute name="label" translatable="yes">Input pad</attribute> ++ <attribute name="action">uim.pad</attribute> ++ </item> ++ <item> ++ <attribute name="label" translatable="yes">Handwriting input pad</attribute> ++ <attribute name="action">uim.hand</attribute> ++ </item> ++ <item> ++ <attribute name="label" translatable="yes">Help</attribute> ++ <attribute name="action">uim.help</attribute> ++ </item> ++ <item> ++ <attribute name="label" translatable="yes">About</attribute> ++ <attribute name="action">uim.about</attribute> ++ </item> ++</section> +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -16,6 +16,7 @@ + gtk2/toolbar/common-gtk.c + gtk2/toolbar/standalone-gtk.c + gtk3/toolbar/applet-gnome3.c ++[type: gettext/glade]gtk3/toolbar/uim-applet-menu.xml + qt3/chardict/bushuviewwidget.cpp + qt3/chardict/qt.cpp + qt3/chardict/unicodeviewwidget.cpp +--- a/configure ++++ b/configure +@@ -28210,12 +28210,12 @@ + pkg_cv_APPLET_GNOME3_CFLAGS="$APPLET_GNOME3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-4.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libpanelapplet-4.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanel-applet\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpanel-applet") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_APPLET_GNOME3_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-4.0" 2>/dev/null` ++ pkg_cv_APPLET_GNOME3_CFLAGS=`$PKG_CONFIG --cflags "libpanel-applet" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -28226,12 +28226,12 @@ + pkg_cv_APPLET_GNOME3_LIBS="$APPLET_GNOME3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-4.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libpanelapplet-4.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanel-applet\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpanel-applet") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_APPLET_GNOME3_LIBS=`$PKG_CONFIG --libs "libpanelapplet-4.0" 2>/dev/null` ++ pkg_cv_APPLET_GNOME3_LIBS=`$PKG_CONFIG --libs "libpanel-applet" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -28251,9 +28251,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanelapplet-4.0" 2>&1` ++ APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanel-applet" 2>&1` + else +- APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanelapplet-4.0" 2>&1` ++ APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanel-applet" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$APPLET_GNOME3_PKG_ERRORS" >&5 +@@ -28284,12 +28284,12 @@ + pkg_cv_APPLET_GNOME3_CFLAGS="$APPLET_GNOME3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-4.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libpanelapplet-4.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanel-applet\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpanel-applet") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_APPLET_GNOME3_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-4.0" 2>/dev/null` ++ pkg_cv_APPLET_GNOME3_CFLAGS=`$PKG_CONFIG --cflags "libpanel-applet" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -28300,12 +28300,12 @@ + pkg_cv_APPLET_GNOME3_LIBS="$APPLET_GNOME3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-4.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libpanelapplet-4.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanel-applet\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpanel-applet") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_APPLET_GNOME3_LIBS=`$PKG_CONFIG --libs "libpanelapplet-4.0" 2>/dev/null` ++ pkg_cv_APPLET_GNOME3_LIBS=`$PKG_CONFIG --libs "libpanel-applet" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -28325,9 +28325,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanelapplet-4.0" 2>&1` ++ APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanel-applet" 2>&1` + else +- APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanelapplet-4.0" 2>&1` ++ APPLET_GNOME3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanel-applet" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$APPLET_GNOME3_PKG_ERRORS" >&5 +--- a/gtk3/toolbar/Makefile.in ++++ b/gtk3/toolbar/Makefile.in +@@ -79,7 +79,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ +- "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(servicedir)" ++ "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(servicedir)" \ ++ "$(DESTDIR)$(xmluidir)" + PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) + am__uim_toolbar_applet_gnome3_SOURCES_DIST = applet-gnome3.c \ + ../../gtk2/toolbar/common-gtk.c +@@ -179,7 +180,7 @@ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +-DATA = $(applet_DATA) $(service_DATA) ++DATA = $(applet_DATA) $(service_DATA) $(xmlui_DATA) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -455,19 +456,22 @@ + org.gnome.panel.applet.UimAppletFactory.service.in + + @APPLET_GNOME3_TRUE@helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" ++@APPLET_GNOME3_TRUE@xmluidir = $(pkgdatadir)/ui ++@APPLET_GNOME3_TRUE@xmlui_DATA = uim-applet-menu.xml + @APPLET_GNOME3_TRUE@uim_toolbar_applet_gnome3_LDADD = @GTK3_LIBS@ @APPLET_GNOME3_LIBS@ \ + @APPLET_GNOME3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ + @APPLET_GNOME3_TRUE@ $(top_builddir)/uim/libuim.la \ + @APPLET_GNOME3_TRUE@ $(top_builddir)/uim/libuim-custom.la + + @APPLET_GNOME3_TRUE@uim_toolbar_applet_gnome3_CPPFLAGS = \ ++@APPLET_GNOME3_TRUE@ -DUIM_UIDATADIR="\"${xmluidir}\"" \ + @APPLET_GNOME3_TRUE@ $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + + @APPLET_GNOME3_TRUE@uim_toolbar_applet_gnome3_CFLAGS = @GTK3_CFLAGS@ @APPLET_GNOME3_CFLAGS@ + @APPLET_GNOME3_TRUE@uim_toolbar_applet_gnome3_SOURCES = applet-gnome3.c \ + @APPLET_GNOME3_TRUE@ ../../gtk2/toolbar/common-gtk.c + +-@APPLET_GNOME3_TRUE@appletdir = $(datadir)/gnome-panel/4.0/applets ++@APPLET_GNOME3_TRUE@appletdir = $(datadir)/gnome-panel/5.0/applets + @APPLET_GNOME3_TRUE@applet_DATA = UimApplet.panel-applet + @APPLET_GNOME3_TRUE@applet_in_files = $(applet_DATA:=.in) + @APPLET_GNOME3_TRUE@applet_in_in_files = $(applet_in_files:=.in) +@@ -817,6 +821,27 @@ + @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) ++install-xmluiDATA: $(xmlui_DATA) ++ @$(NORMAL_INSTALL) ++ @list='$(xmlui_DATA)'; test -n "$(xmluidir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(xmluidir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(xmluidir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xmluidir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(xmluidir)" || exit $$?; \ ++ done ++ ++uninstall-xmluiDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(xmlui_DATA)'; test -n "$(xmluidir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(xmluidir)'; $(am__uninstall_files_from_dir) + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -904,7 +929,7 @@ + check: check-am + all-am: Makefile $(PROGRAMS) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(servicedir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(xmluidir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am +@@ -961,7 +986,8 @@ + + info-am: + +-install-data-am: install-appletDATA install-serviceDATA ++install-data-am: install-appletDATA install-serviceDATA \ ++ install-xmluiDATA + + install-dvi: install-dvi-am + +@@ -1008,7 +1034,8 @@ + ps-am: + + uninstall-am: uninstall-appletDATA uninstall-binPROGRAMS \ +- uninstall-libexecPROGRAMS uninstall-serviceDATA ++ uninstall-libexecPROGRAMS uninstall-serviceDATA \ ++ uninstall-xmluiDATA + + .MAKE: install-am install-strip + +@@ -1027,7 +1054,7 @@ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-appletDATA \ + uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ +- uninstall-serviceDATA ++ uninstall-serviceDATA install-xmluiDATA uninstall-xmluiDATA + + + @APPLET_GNOME3_TRUE@$(applet_in_files): $(applet_in_in_files) Makefile diff -Nru uim-1.8.6/debian/patches/series uim-1.8.6/debian/patches/series --- uim-1.8.6/debian/patches/series 2015-06-05 15:46:44.000000000 +0300 +++ uim-1.8.6/debian/patches/series 2015-06-17 11:29:11.000000000 +0300 @@ -10,3 +10,4 @@ 95_sock_cloexec.patch add_keywords_to_application_desktop_files.patch fix-stuck-messages-to-uim-input-pad-ja.patch +libpanel-applet.patch diff -Nru uim-1.8.6/debian/uim-applet-gnome.install uim-1.8.6/debian/uim-applet-gnome.install --- uim-1.8.6/debian/uim-applet-gnome.install 2012-10-17 22:12:31.000000000 +0400 +++ uim-1.8.6/debian/uim-applet-gnome.install 2015-06-17 11:30:27.000000000 +0300 @@ -1,3 +1,4 @@ usr/lib/*/uim/uim-toolbar-applet-gnome3 usr/share/dbus-1/services/org.gnome.panel.applet.UimAppletFactory.service -usr/share/gnome-panel/4.0/applets/UimApplet.panel-applet +usr/share/gnome-panel/5.0/ +usr/share/uim/ui/uim-applet-menu.xml
signature.asc
Description: OpenPGP digital signature
