Fix make dpkg errors, and add gtk3 support for debian

BUG=None
TEST=Linux desktop

Review URL: http://codereview.appspot.com/4436076

diff --git a/Makefile.am b/Makefile.am
index 29c57e1..7be558b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,11 +119,12 @@ srpm: dist @PACKAGE_NAME@.spec
 debian/changelog:
        $(AM_V_GEN) \
        ( \
+               . /etc/lsb-release; \
                date=`date -R`; \
                version=@VERSION@; \
                serie=$(serie); \
                if test -z "$$serie"; then \
-                 serie=maverick; \
+                 serie=$$DISTRIB_CODENAME; \
                fi; \
                if test -z "$$release"; then \
                  release=1; \

diff --git a/debian/control b/debian/control
index a3b8820..22f77d4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 7),
  iso-codes,
  libgconf2-dev,
  libgtk2.0-dev,
+ libgtk-3-dev,
  libtool,
  python-support (>= 0.6),
  python-dev,
@@ -28,7 +29,7 @@ Package: ibus
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-glade2,
  python-ibus (= ${source:Version}), python-xdg, librsvg2-common
-Recommends: im-switch, ibus-gtk | ibus-qt4
+Recommends: im-switch, ibus-gtk2, ibus-gtk3, ibus-qt4
 Conflicts: ibus-anthy (<< 1.2),
  ibus-table (<< 1.2),
  ibus-pinyin (<< 1.2.99),
@@ -66,7 +67,7 @@ Description: New input method framework using dbus
  This package contains the header files and static libraries which is
  needed for developing the IBus applications.
 
-Package: ibus-gtk
+Package: ibus-gtk2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: New input method framework using dbus
@@ -74,7 +75,17 @@ Description: New input method framework using dbus
  OS. It provides full featured and user friendly input method user interface.
  It also may help developers to develop input method easily.
  .
- ibus-gtk is the GTK+ client of ibus, it provide a gtk-immodule for ibus.
+ ibus-gtk2 is the GTK+-2.0 client of ibus, it provide a gtk-immodule for ibus.
+
+Package: ibus-gtk3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: New input method framework using dbus
+ IBus is an Intelligent Input Bus. It is a new input framework for Linux
+ OS. It provides full featured and user friendly input method user interface.
+ It also may help developers to develop input method easily.
+ .
+ ibus-gtk3 is the GTK+-3.0 client of ibus, it provide a gtk-immodule for ibus.
  
 Package: python-ibus
 Section: python

diff --git a/debian/ibus-gtk.install b/debian/ibus-gtk2.install
similarity index 100%
rename from debian/ibus-gtk.install
rename to debian/ibus-gtk2.install

diff --git a/debian/libibus-1.0-0.symbols b/debian/libibus-1.0-0.symbols
index 05efe6b..3b80ffc 100644 (file)
--- a/debian/libibus-1.0-0.symbols
+++ b/debian/libibus-1.0-0.symbols
@@ -163,6 +163,7 @@ libibus-1.0.so.0 libibus-1.0-0 #MINVER#
  ibus_hotkey_profile_remove_hotkey@Base 1.3.99.20101019
  ibus_hotkey_profile_remove_hotkey_by_event@Base 1.3.99.20101019
  ibus_init@Base 1.3.99.20101019
+ ibus_input_context_cancel_hand_writing@Base 1.3.99.20110430
  ibus_input_context_cursor_down@Base 1.3.99.20101019
  ibus_input_context_cursor_up@Base 1.3.99.20101019
  ibus_input_context_disable@Base 1.3.99.20101019
@@ -185,6 +186,7 @@ libibus-1.0.so.0 libibus-1.0-0 #MINVER#
  ibus_input_context_new_async_finish@Base 1.3.99.20110316
  ibus_input_context_page_down@Base 1.3.99.20101019
  ibus_input_context_page_up@Base 1.3.99.20101019
+ ibus_input_context_process_hand_writing_event@Base 1.3.99.20110430
  ibus_input_context_process_key_event@Base 1.3.99.20101019
  ibus_input_context_process_key_event_async@Base 1.3.99.20110124
  ibus_input_context_process_key_event_async_finish@Base 1.3.99.20110124

diff --git a/debian/rules b/debian/rules
index bf37515..4f6fa2a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ build: patch
        ln -sf /usr/share/misc/config.guess config.guess
        dh $@ --before auto_configure
        dh_auto_configure -- \
+               --enable-gtk3 \
                --enable-static \
                --enable-surrounding-text \
                --with-panel-icon-keyboard=ibus-keyboard \
@@ -20,13 +21,17 @@ install:
        rm -rf $(CURDIR)/debian/tmp/usr/lib/libibus*.la \
                $(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.a \
                $(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.la \
+               $(CURDIR)/debian/tmp/usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.a \
+               $(CURDIR)/debian/tmp/usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.la \
                $(CURDIR)/debian/tmp/etc/xdg \
                $(CURDIR)/debian/tmp/usr/share/applications/ibus.desktop
        dh_install --list-missing --fail-missing
        dh_installdocs # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552293
        dh $@ --after installdocs
        LD_LIBRARY_PATH=debian/libibus-1.0-0/usr/lib:$(LD_LIBRARY_PATH) \
-               dh_gtkmodules -p ibus-gtk -s
+               dh_gtkmodules -p ibus-gtk2 -s
+       LD_LIBRARY_PATH=debian/libibus-1.0-0/usr/lib:$(LD_LIBRARY_PATH) \
+               dh_gtkmodules -p ibus-gtk3 -s
 
 install-stamp: install
        touch $@
@@ -41,7 +46,8 @@ binary-indep: install-stamp
 
 binary-arch: install-stamp
        dh_strip -s
-       dh_makeshlibs -Nibus-gtk -s
+       dh_makeshlibs -Nibus-gtk2 -s
+       dh_makeshlibs -Nibus-gtk3 -s
        dh_shlibdeps -s
        dh_installdeb -s
        dh_gencontrol -s

diff --git a/debian/xinput/ibus b/debian/xinput/ibus
index 2296864..1206946 100644 (file)
--- a/debian/xinput/ibus
+++ b/debian/xinput/ibus
@@ -12,5 +12,5 @@ if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
 else
        QT_IM_MODULE=xim
 fi
-DEPENDS="ibus, ibus-gtk|ibus-qt4"
+DEPENDS="ibus, ibus-gtk2, ibus-gtk3|ibus-qt4"
 # vim:ft=sh: