[pull] master from phuang:master

AUTHORS

@@ -15,6 +15,8 @@ da.po:
 Kris Thomsen <[email protected]>
 de.po:
 Fabian Affolter <[email protected]>
+en_GB.po:
+Steven Panek <[email protected]>
 es.po:
 Domingo Becker <[email protected]>
 fr.po:
@@ -43,6 +45,8 @@ pa.po:
 Amanpreet Singh <[email protected]>
 pl.po:
 Piotr Drąg <[email protected]>
+pt_BR.po:
+Glaucia Freitas <[email protected]>
 ru.po:
 koterpillar
 sr.po [email protected]:

Makefile.am

@@ -20,44 +20,54 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
-if ENABLE_PYTHON
-PYTHON_DIRS = \
-	ibus \
-	setup \
-	$(NULL)
+NULL =
+
+UI_DIR = ui
+
+if ENABLE_SETUP
+SETUP_DIR = setup
 endif
 
-if ENABLE_GCONF
-GCONF_DIRS = \
-	gconf \
+if ENABLE_PYTHON_LIBRARY
+PYTHON_LIB_DIRS = ibus
+endif
+
+if ENABLE_DAEMON
+DAEMON_DIR = \
+	bus \
 	$(NULL)
 endif
 
 SUBDIRS = \
 	src \
-	bus \
 	util \
+	conf \
 	client \
+	engine \
+	tools \
 	data \
 	m4 \
 	po \
 	docs \
-	ui \
 	bindings \
-	$(PYTHON_DIRS) \
-	$(GCONF_DIRS) \
+	$(UI_DIR) \
+	$(DAEMON_DIR) \
+	$(PYTHON_LIB_DIRS) \
+	$(SETUP_DIR) \
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ibus-1.0.pc
+pkgconfig_DATA = ibus-@IBUS_API_VERSION@.pc
 
+ibus_pc_in = ibus-@[email protected]
 EXTRA_DIST = \
 	autogen.sh \
-	ibus-1.0.pc.in \
+	$(ibus_pc_in) \
 	ibus.spec.in \
 	python-config.py \
+	xinput-ibus \
 	$(NULL)
 
 noinst_DIST = \
@@ -73,13 +83,23 @@ install-data-hook:
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--disable-schemas-install \
+	--disable-introspection \
 	$(NULL)
 
 dist-hook:
 	if test -d .git ; then \
 		git log --name-status --date=iso > $(distdir)/ChangeLog ; \
 	fi
 
+distclean-local:
+	if test "x$(srcdir)" = "x."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/ChangeLog \
+	$(NULL)
+
 rpm: dist @[email protected]
 	rpmbuild -bb \
 			--define "_sourcedir `pwd`" \
@@ -102,11 +122,12 @@ srpm: dist @[email protected]
 debian/changelog:
 	$(AM_V_GEN) \
 	( \
+		. /etc/lsb-release; \
 		date=`date -R`; \
 		version=@VERSION@; \
 		serie=$(serie); \
 		if test -z "$$serie"; then \
-		  serie=lucid; \
+		  serie=$$DISTRIB_CODENAME; \
 		fi; \
 		if test -z "$$release"; then \
 		  release=1; \
@@ -127,6 +148,17 @@ ppa: dist debian/changelog
 		debuild -S -sa ; \
 	)
 
+dpkg: dist debian/changelog
+	$(AM_V_GEN) \
+	( \
+		mkdir ppa; \
+		cd ppa; \
+		tar zxvf ../$(distdir).tar.gz ; \
+		cd $(distdir); \
+		cp -a ../../debian . ; \
+		cd debian; \
+		debuild -b -us -uc; \
+	)
 
 clean-rpm:
 	$(RM) -r "`uname -i`"
@@ -137,4 +169,23 @@ git-tag:
 	git tag -s @PACKAGE_VERSION@
 
 git-clean-tree:
-	git clean -d -f -x	
+	git clean -d -f -x
+
+GITIGNOREFILES = \
+	INSTALL \
+	aclocal.m4 \
+	compile \
+	config.guess \
+	config.h.in \
+	config.sub \
+	depcomp \
+	gtk-doc.make \
+	install-sh \
+	ltmain.sh \
+	missing \
+	mkinstalldirs \
+	py-compile \
+	stamp-h* \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk

autogen.sh

@@ -22,4 +22,4 @@ which gnome-autogen.sh || {
     touch $srcdir/ChangeLog
 }
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.8 . gnome-autogen.sh
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="-Wall $CFLAGS" . gnome-autogen.sh

bindings/Makefile.am

@@ -27,3 +27,5 @@ endif
 SUBDIRS = \
 	$(VALA_DIR) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk

bindings/vala/IBus-1.0-custom.vala

@@ -0,0 +1,9 @@
+namespace IBus {
+	// For some reason, ibus_text_new_from_static_string is hidden in GIR
+	// https://github.com/ibus/ibus/commit/37e6e587
+	[CCode (type_id = "ibus_text_get_type ()", cheader_filename = "ibus.h")]
+	public class Text : IBus.Serializable {
+		[CCode (cname = "ibus_text_new_from_static_string", has_construct_function = false)]
+		public Text.from_static_string (string str);
+	}
+}

bindings/vala/IBus-1.0.metadata

@@ -0,0 +1 @@
+IBus cheader_filename="ibus.h"

bindings/vala/Makefile.am

@@ -22,8 +22,30 @@
 
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
-	ibus-1.0.vapi \
+	ibus-@[email protected] \
+	ibus-@[email protected] \
 	$(NULL)
 
-ibus-1.0.vapi:
-	vapigen --library ibus-1.0 ibus-1.0/ibus-1.0.gi ibus-1.0/ibus-1.0-custom.vala
+# Don't rebuild vapi every time gir is updated.
+vapi_deps = \
+	$(srcdir)/IBus-1.0.metadata \
+	$(srcdir)/IBus-1.0-custom.vala \
+	| \
+	$(top_srcdir)/src/IBus-@[email protected] \
+	$(NULL)
+
+ibus-@[email protected]: $(vapi_deps)
+	$(AM_V_GEN) $(VAPIGEN) --library ibus-@IBUS_API_VERSION@ \
+			--pkg gio-2.0 \
+			--metadatadir=$(srcdir) \
+			$(top_srcdir)/src/IBus-@[email protected] \
+			$(srcdir)/IBus-1.0-custom.vala
+
+EXTRA_DIST = \
+	IBus-1.0.metadata \
+	IBus-1.0-custom.vala \
+	$(NULL)
+
+MAINTAINERCLEANFILES = ibus-@[email protected]
+
+-include $(top_srcdir)/git.mk

bindings/vala/ibus-1.0.deps

@@ -0,0 +1 @@
+gio-2.0