[maemo-commits] [maemo-commits] r12138 - in projects/haf/trunk/hildon-plugins-settings: . data debian src

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Jun 6 20:36:24 EEST 2007
Author: moimart
Date: 2007-06-06 20:36:20 +0300 (Wed, 06 Jun 2007)
New Revision: 12138

Added:
   projects/haf/trunk/hildon-plugins-settings/data/hildon-plugin-settings-bin.desktop.in
   projects/haf/trunk/hildon-plugins-settings/debian/
   projects/haf/trunk/hildon-plugins-settings/debian/changelog
   projects/haf/trunk/hildon-plugins-settings/debian/control
   projects/haf/trunk/hildon-plugins-settings/debian/copyright
   projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-bin.install
   projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-cpa.install
   projects/haf/trunk/hildon-plugins-settings/debian/rules
   projects/haf/trunk/hildon-plugins-settings/po/
Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/Makefile.am
   projects/haf/trunk/hildon-plugins-settings/configure.ac
   projects/haf/trunk/hildon-plugins-settings/data/Makefile.am
   projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
Log:
2007-06-06  Moises Martinez  <moises.martinez at nokia.com>

        * src/hildon-plugin-settings-dialog.c:
        - Added support for localization.
        * configure.ac:
        - Added localization
        - Updated *.in files
        * data/hildon-plugin-settings-bin.desktop.in: Added for standalone
        application.
        * debian/*: Added debian packaging.
	* ChangeLog updated.




Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-06 17:36:20 UTC (rev 12138)
@@ -1,5 +1,16 @@
 2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
 
+	* src/hildon-plugin-settings-dialog.c:
+	- Added support for localization.
+	* configure.ac: 
+	- Added localization
+	- Updated *.in files
+	* data/hildon-plugin-settings-bin.desktop.in: Added for standalone
+	application.
+	* debian/*: Added debian packaging.
+
+2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hildon-plugin-settings-dialog.c: Fixed toggling checkboxes when
 	using a TreeModelFilter.
 	* src/hildon-plugin-settings.c: Added visibility_filter for

Modified: projects/haf/trunk/hildon-plugins-settings/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/Makefile.am	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/Makefile.am	2007-06-06 17:36:20 UTC (rev 12138)
@@ -1,3 +1,3 @@
-SUBDIRS = src
+SUBDIRS = src data
 
 CLEANFILES = *~

Modified: projects/haf/trunk/hildon-plugins-settings/configure.ac
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-06-06 17:36:20 UTC (rev 12138)
@@ -29,6 +29,15 @@
 
 AC_HEADER_STDC
 
+#++++++++++++
+# i18n setup
+#++++++++++++
+
+ALL_LINGUAS="en_GB"
+AC_SUBST(ALL_LINGUAS)
+AM_GLIB_GNU_GETTEXT
+AC_DEFINE(GETTEXT_PACKAGE, ["osso-applet-tasknavigator"], [Package name for gettext])
+
 if test foobar${hildon_use_debug} = foobaryes 
 then
     CFLAGS="$CFLAGS -ggdb -O0 -DDEBUG"
@@ -68,10 +77,6 @@
 AC_SUBST(CP_LIBS)
 AC_SUBST(CP_CFLAGS)
 
-PKG_CHECK_MODULES(LIBOSSOHELP, libossohelp >= 0.0.4)
-AC_SUBST(LIBOSSOHELP_LIBS)
-AC_SUBST(LIBOSSOHELP_CFLAGS)
-
 PKG_CHECK_MODULES(LIBHILDONMENU, libhildonmenu >= 0.0.1 )
 AC_SUBST(LIBHILDONMENU_LIBS)
 AC_SUBST(LIBHILDONMENU_CFLAGS)
@@ -84,6 +89,8 @@
 AC_SUBST(pluginlibdir)
 desktopentrydir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir`
 AC_SUBST(desktopentrydir)
+desktopbinentrydir=`pkg-config osso-af-settings --variable=desktopentrydir`
+AC_SUBST(desktopbinentrydir)
 
 PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1)
 localedir=`pkg-config osso-af-settings --variable=localedir`
@@ -92,5 +99,6 @@
 AC_OUTPUT(Makefile \
 	  src/Makefile \
 	  data/hildon-plugins-settings.desktop \
+	  data/hildon-plugin-settings-bin.desktop \
 	  data/Makefile)
 

Modified: projects/haf/trunk/hildon-plugins-settings/data/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/data/Makefile.am	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/data/Makefile.am	2007-06-06 17:36:20 UTC (rev 12138)
@@ -1,2 +1,3 @@
 desktopentry_DATA = hildon-plugins-settings.desktop
+desktopbinentry_DATA = hildon-plugin-settings-bin.desktop
 

Added: projects/haf/trunk/hildon-plugins-settings/data/hildon-plugin-settings-bin.desktop.in
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/data/hildon-plugin-settings-bin.desktop.in	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/data/hildon-plugin-settings-bin.desktop.in	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Hildon Plugins Settings
+Comment=Plugins Settings for Hildon Desktop
+Exec=/usr/bin/hildon-plugin-settings
+Icon=qgn_list_cntlpane
+X-Icon-path=/usr/share/pixmaps/
+X-Window-Icon=tn-bookmarks-link
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable

Added: projects/haf/trunk/hildon-plugins-settings/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/changelog	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/debian/changelog	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,6 @@
+hildon-plugins-settings (0.0.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Moises Martinez <moises.martinez at nokia.com>  Wed,  6 Jun 2007 19:22:40 +0300
+

Added: projects/haf/trunk/hildon-plugins-settings/debian/control
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/control	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/debian/control	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,19 @@
+Source: hildon-plugins-settings
+Section: x11
+Priority: optional
+Maintainer: unknown <moises.martinez at nokia.com>
+Build-Depends: debhelper (>= 4.0.0), libosso-dev (>= 0.9.19), osso-af-settings, hildon-control-panel-dev, hildon-desktop (>= 0.0.16), libhildondesktop (>= 0.0.16), libhildon1-dev, libhildonmenu0-dev
+Standards-Version: 3.6.1
+
+Package: hildon-plugins-settings-cpa
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, osso-applet-tasknavigator-l10n-mr | osso-applet-tasknavigator-l10n-mr0, hildon-control-panel
+Conflicts: hildon-control-panel-navigatorapplet
+Description: Hildon Control Panel's Task navigator & Statusbar applet plugin
+ Hildon Control Panel applet to configure the Hildon Desktop's panels.
+
+Package: hildon-plugins-settings-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, osso-applet-tasknavigator-l10n-mr | osso-applet-tasknavigator-l10n-mr0
+Description: Hildon Desktop's Plugins Settings
+ Hildon Control Panel applet to configure the Hildon Desktop's plugins.

Added: projects/haf/trunk/hildon-plugins-settings/debian/copyright
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/copyright	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/debian/copyright	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,12 @@
+This package was debianized by unknown <moises.martinez at nokia.com> on
+Wed,  6 Jun 2007 19:22:40 +0300.
+
+It was downloaded from <fill in ftp site>
+
+Copyright:
+
+Upstream Author(s): <put author(s) name and email here>
+
+License:
+
+<Must follow here>

Added: projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-bin.install
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-bin.install	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-bin.install	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,2 @@
+usr/bin/hildon-plugin-settings*
+

Added: projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-cpa.install
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-cpa.install	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-cpa.install	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,2 @@
+usr/lib/hildon-control-panel/*.so
+usr/share/applications/hildon-control-panel/*.desktop*

Added: projects/haf/trunk/hildon-plugins-settings/debian/rules
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/rules	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/debian/rules	2007-06-06 17:36:20 UTC (rev 12138)
@@ -0,0 +1,142 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
+   LAUNCHER = yes
+endif
+
+ifeq "$(strip $(LAUNCHER))" "yes"
+   LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
+   LAUNCHER_LDFLAGS = -shared
+endif
+
+# Use soft-float and thumb mode if it enabled.
+ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -mthumb -fPIC
+endif
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -ggdb -DDEBUG
+endif
+
+# shared library versions, option 1
+version=0.0.0
+major=0
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+config.status: configure
+	dh_testdir
+# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-dependency-tracking
+
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+# Add here commands to compile the package.
+	$(MAKE) LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+#	dh_clean -k 
+	dh_installdirs
+
+# Add here commands to install the package into debian/build
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/build
+ifeq "$(strip $(LAUNCHER))" "yes"
+	mv debian/build/usr/bin/hildon-desktop debian/build/usr/bin/hildon-desktop.launch
+	ln -s maemo-invoker debian/build/usr/bin/hildon-desktop
+endif
+
+configure: configure-stamp
+
+configure-stamp:
+	dh_testdir
+	./autogen.sh
+	touch configure-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+#	dh_installexamples
+	dh_installdocs
+	dh_install --sourcedir=debian/build -v
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip --dbg-package="hildon-desktop" --dbg-package="libhildondesktop0" --dbg-package="libhildonwm0"
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol -- $(LAUNCHER_DEPENDS)
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 


Property changes on: projects/haf/trunk/hildon-plugins-settings/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Modified: projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-06-06 17:36:20 UTC (rev 12138)
@@ -3,7 +3,6 @@
 
 INCLUDES = \
 	$(CP_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) \
-        $(LIBOSSOHELP_CFLAGS) \
         $(LIBHILDONMENU_CFLAGS) \
 	$(HILDONDESKTOP_CFLAGS) \
 	$(LIBHILDONDESKTOP_CFLAGS) \
@@ -14,7 +13,7 @@
 
 LDFLAGS = -module -avoid-version
 HILDON_PLUGIN_LDADDS = $(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) \
-	 	       $(LIBOSSOHELP_LIBS) $(LIBHILDONMENU_LIBS)
+	 	       $(LIBHILDONMENU_LIBS)
 
 HILDON_PLUGIN_SOURCES = \
 	hildon-plugin-config-parser.h \

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-06-06 16:23:03 UTC (rev 12137)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-06-06 17:36:20 UTC (rev 12138)
@@ -23,6 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "hildon-plugin-settings-dialog.h"
 #include "hildon-plugin-config-parser.h"
 #include "hildon-plugin-cell-renderer-button.h"
@@ -31,16 +35,17 @@
 #include <gtk/gtktreemodelfilter.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include <hildon-desktop/hd-config.h>
 
-#define HPSD_OK "Ok"
-#define HPSD_CANCEL "Cancel"
+#define HPSD_OK _("tncpa_bv_tnsb_ok")
+#define HPSD_CANCEL _("tncpa_bv_tnsb_cancel")
 
 #define HPSD_TAB_SB "Statusbar"
 #define HPSD_TAB_TN "Task Navigator"
 
-#define HPSD_TITLE "Plugin's Settings"
+#define HPSD_TITLE _("tncpa_ti_tnsb_title") 
 
 #ifndef HP_PATH_TN
 #define HP_PATH_TN "/usr/share/applications/hildon-navigator"
@@ -146,6 +151,10 @@
   settings->priv->type = HILDON_PLUGIN_SETTINGS_DIALOG_TYPE_DIALOG;
 
   settings->priv->hide_home = TRUE;
+
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
 }
 
 static void 


More information about the maemo-commits mailing list