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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-06-06 20:47:41 +0300 (Wed, 06 Jun 2007)
New Revision: 12142

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/configure.ac
   projects/haf/trunk/hildon-plugins-settings/debian/control
   projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-bin.install
   projects/haf/trunk/hildon-plugins-settings/debian/rules
   projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
Log:
2007-06-06  Moises Martinez  <moises.martinez at nokia.com>

        * debian/*: updated.
        * configure.ac:
        * src/Makefile.am:
        - Removed libhildonmenu
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-06 17:43:46 UTC (rev 12141)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-06 17:47:41 UTC (rev 12142)
@@ -1,5 +1,12 @@
 2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
 
+	* debian/*: updated.
+  	* configure.ac: 
+	* src/Makefile.am:
+	- Removed libhildonmenu	
+
+2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hildon-plugin-settings-dialog.c:
 	- Added support for localization.
 	* configure.ac: 

Modified: projects/haf/trunk/hildon-plugins-settings/configure.ac
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-06-06 17:43:46 UTC (rev 12141)
+++ projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-06-06 17:47:41 UTC (rev 12142)
@@ -77,10 +77,6 @@
 AC_SUBST(CP_LIBS)
 AC_SUBST(CP_CFLAGS)
 
-PKG_CHECK_MODULES(LIBHILDONMENU, libhildonmenu >= 0.0.1 )
-AC_SUBST(LIBHILDONMENU_LIBS)
-AC_SUBST(LIBHILDONMENU_CFLAGS)
-
 PKG_CHECK_MODULES(LIBHILDONMENU, hildon-1)
 AC_SUBST(LIBHILDON_LIBS)
 AC_SUBST(LIBHILDON_CFLAGS)

Modified: projects/haf/trunk/hildon-plugins-settings/debian/control
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/control	2007-06-06 17:43:46 UTC (rev 12141)
+++ projects/haf/trunk/hildon-plugins-settings/debian/control	2007-06-06 17:47:41 UTC (rev 12142)
@@ -2,7 +2,7 @@
 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
+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
 Standards-Version: 3.6.1
 
 Package: hildon-plugins-settings-cpa

Modified: 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 17:43:46 UTC (rev 12141)
+++ projects/haf/trunk/hildon-plugins-settings/debian/hildon-plugins-settings-bin.install	2007-06-06 17:47:41 UTC (rev 12142)
@@ -1,2 +1,3 @@
 usr/bin/hildon-plugin-settings*
+usr/share/applications/hildon/*.desktop
 

Modified: projects/haf/trunk/hildon-plugins-settings/debian/rules
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/rules	2007-06-06 17:43:46 UTC (rev 12141)
+++ projects/haf/trunk/hildon-plugins-settings/debian/rules	2007-06-06 17:47:41 UTC (rev 12142)
@@ -92,8 +92,8 @@
 # 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
+	mv debian/build/usr/bin/hildon-plugin-settings debian/build/usr/bin/hildon-plugin-settings.launch
+	ln -s maemo-invoker debian/build/usr/bin/hildon-plugin-settings
 endif
 
 configure: configure-stamp
@@ -126,7 +126,7 @@
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip --dbg-package="hildon-desktop" --dbg-package="libhildondesktop0" --dbg-package="libhildonwm0"
+#	dh_strip 
 	dh_compress
 	dh_fixperms
 #	dh_perl

Modified: projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-06-06 17:43:46 UTC (rev 12141)
+++ projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-06-06 17:47:41 UTC (rev 12142)
@@ -3,7 +3,6 @@
 
 INCLUDES = \
 	$(CP_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) \
-        $(LIBHILDONMENU_CFLAGS) \
 	$(HILDONDESKTOP_CFLAGS) \
 	$(LIBHILDONDESKTOP_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
@@ -12,8 +11,7 @@
 
 
 LDFLAGS = -module -avoid-version
-HILDON_PLUGIN_LDADDS = $(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) \
-	 	       $(LIBHILDONMENU_LIBS)
+HILDON_PLUGIN_LDADDS = $(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS)
 
 HILDON_PLUGIN_SOURCES = \
 	hildon-plugin-config-parser.h \
@@ -44,7 +42,7 @@
 
 hildon_plugin_settings_LDADD = \
 	$(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) \
-        $(LIBOSSOHELP_LIBS) $(LIBHILDONMENU_LIBS) $(LIBHILDON_LIBS)
+        $(LIBHILDON_LIBS)
 
 hildon_plugin_settings_SOURCES = \
 	$(HILDON_PLUGIN_SOURCES) \