[maemo-commits] [maemo-commits] r13693 - in projects/haf/trunk/hildon-input-method: . debian src

[From: subversion at stage.maemo.org]

Author: manwari
Date: 2007-09-10 13:21:03 +0300 (Mon, 10 Sep 2007)
New Revision: 13693

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/configure.ac
   projects/haf/trunk/hildon-input-method/debian/changelog
   projects/haf/trunk/hildon-input-method/src/Makefile.am
Log:
1:1.99.25-1

Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2007-09-10 10:08:37 UTC (rev 13692)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2007-09-10 10:21:03 UTC (rev 13693)
@@ -1,3 +1,7 @@
+2007-09-10  Mohammad Anwari  <mdamt at maemo.org>
+
+	* src/Makefile.am: Added internal.h to SOURCES in order to get into make dist.
+
 2007-09-10  Richard Sun  <richard.sun at nokia.com>
 
 	* src/hildon-im-ui.c: 

Modified: projects/haf/trunk/hildon-input-method/configure.ac
===================================================================
--- projects/haf/trunk/hildon-input-method/configure.ac	2007-09-10 10:08:37 UTC (rev 13692)
+++ projects/haf/trunk/hildon-input-method/configure.ac	2007-09-10 10:21:03 UTC (rev 13693)
@@ -61,7 +61,6 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-# hildon-im-context.c needs this for one single enumeration
 PKG_CHECK_MODULES(HILDON, hildon-1 >= 1.0.0)
 AC_SUBST(HILDON_LIBS)
 AC_SUBST(HILDON_CFLAGS)
@@ -94,10 +93,6 @@
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 
-# We need this for our immodule
-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-AC_SUBST(GTK_VERSION)
-
 localedir=${datadir}/locale
 
 etcdir=$sysconfdir

Modified: projects/haf/trunk/hildon-input-method/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-input-method/debian/changelog	2007-09-10 10:08:37 UTC (rev 13692)
+++ projects/haf/trunk/hildon-input-method/debian/changelog	2007-09-10 10:21:03 UTC (rev 13693)
@@ -1,6 +1,6 @@
-hildon-input-method (1:1.99.25-1) UNRELEASED; urgency=low
+hildon-input-method (1:1.99.25-1) unstable; urgency=low
 
-  * Fixes: NB#68637.
+  * Fixes: NB#68637, NB#68624.
 
  -- Mohammad Anwari <Mohammad.anwari at nokia.com>  Thu,  6 Sep 2007 14:20:44 +0300
 

Modified: projects/haf/trunk/hildon-input-method/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-input-method/src/Makefile.am	2007-09-10 10:08:37 UTC (rev 13692)
+++ projects/haf/trunk/hildon-input-method/src/Makefile.am	2007-09-10 10:21:03 UTC (rev 13693)
@@ -45,7 +45,7 @@
 	hildon-im-widget-loader.h \
   hildon-im-languages.c \
   hildon-im-languages.h cache.c cache.h \
-	hildon-im-settings-plugin.c
+	hildon-im-settings-plugin.c internal.h
 libhildon_im_ui_la_LIBADD = \
 	$(GTK_LIBS) $(GCONF_LIBS) $(ESD_LIBS) $(HILDON_LIBS) \
 	$(LIBOSSO_LIBS) $(LIBHILDONHELP_LIBS) $(HILDON_IMF_LIBS)\