[meego-commits] 5440: Changes to Trunk:Netbook/meego-panel-devices

[Priya Vijayan]

Hi,
I have made the following changes to meego-panel-devices in project Trunk:Netbook. Please review and accept ASAP.

Thank You,
Priya Vijayan

[This message was auto-generated]

---

Request #5440:

  submit:   home:priya:branches:Trunk:Netbook/meego-panel-devices(r5)(cleanup) -> Trunk:Netbook/meego-panel-devices


Message:
    Rename MEEGO to X-MEEGO-NB in .desktop files to match with uxlaunch change

State:   new          2010-07-08T08:25:45 priya
Comment: None



changes files:
--------------
--- meego-panel-devices.changes
+++ meego-panel-devices.changes
@@ -0,0 +1,3 @@
+* Thu Jul 08 2010 Priya Vijayan <priya.vijayan at intel.com> - 0.2.1
+- Rename MEEGO to X-MEEGO-NB in .desktop file
+

new:
----
  rename-onlyshowin-desktopfile.patch

spec files:
-----------
--- meego-panel-devices.spec
+++ meego-panel-devices.spec
@@ -1,24 +1,23 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.16
+# spectacle version 0.17
 # 
 # >> macros
 # << macros
 
 Name:       meego-panel-devices
-Summary:    Meego devices panel
+Summary:    Meego Devices panel
 Version:    0.2.1
 Release:    1
 Group:      System Environment/Desktop
 License:    LGPL 2.1
-URL:        http://www.meego.org
+URL:        http://www.meego.com
 Source0:    %{name}-%{version}.tar.gz
 Source100:  meego-panel-devices.yaml
+Patch0:     rename-onlyshowin-desktopfile.patch
 Requires:   mutter-meego
 Requires:   gthumb
-Requires(post): desktop-file-utils
 Requires(post): /bin/touch
-Requires(postun): desktop-file-utils
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(libcanberra-gtk)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib) >= 0.9.15
@@ -36,6 +35,7 @@
 BuildRequires:  desktop-file-utils
 Obsoletes:   moblin-panel-devices
 
+
 %description
 Meego devices panel
 
@@ -44,6 +44,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+# rename-onlyshowin-desktopfile.patch
+%patch0 -p1
 # >> setup
 # << setup
 
@@ -68,19 +70,19 @@
 # << install post
 %find_lang meego-panel-devices
 
+
+
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache \
   --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
-
 %postun
 /bin/touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache \
   --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
-
 %files -f meego-panel-devices.lang
 %defattr(-,root,root,-)
 # >> files

other changes:
--------------

++++++ meego-panel-devices.yaml
--- meego-panel-devices.yaml
+++ meego-panel-devices.yaml
@@ -1,5 +1,5 @@
 Name: meego-panel-devices
-Summary: Devices panel
+Summary: Meego Devices panel
 Description: Meego devices panel
 Version: 0.2.1
 Release: 1
@@ -9,6 +9,8 @@
 
 Sources:
     - "%{name}-%{version}.tar.gz"
+Patches:
+    - rename-onlyshowin-desktopfile.patch
 
 Requires:
     - mutter-meego
@@ -18,6 +20,7 @@
     - intltool
     - gettext
     - gnome-common
+    - desktop-file-utils
 
 PkgConfigBR:
     - dbus-glib-1

++++++ rename-onlyshowin-desktopfile.patch (new)
--- rename-onlyshowin-desktopfile.patch
+++ rename-onlyshowin-desktopfile.patch
+diff -Naur meego-panel-devices-0.2.1.orig/data/meego-panel-devices.desktop.in.in meego-panel-devices-0.2.1.new/data/meego-panel-devices.desktop.in.in
+--- meego-panel-devices-0.2.1.orig/data/meego-panel-devices.desktop.in.in	2010-07-08 10:59:33.397228261 -0700
++++ meego-panel-devices-0.2.1.new/data/meego-panel-devices.desktop.in.in	2010-07-08 10:59:12.459041499 -0700
+@@ -9,7 +9,7 @@
+ _Comment=Devices panel
+ Terminal=false
+ Categories=
+-OnlyShowIn=MEEGO;
++OnlyShowIn=X-MEEGO-NB;
+ X-Meego-Priority=Late
+ X-Meego-Service=com.meego.UX.Shell.Panels.devices
+ X-Meego-Panel-Optional=false
+diff -Naur meego-panel-devices-0.2.1.orig/power-icon/data/meego-power-icon.desktop.in.in meego-panel-devices-0.2.1.new/power-icon/data/meego-power-icon.desktop.in.in
+--- meego-panel-devices-0.2.1.orig/power-icon/data/meego-power-icon.desktop.in.in	2010-07-08 11:07:34.819162394 -0700
++++ meego-panel-devices-0.2.1.new/power-icon/data/meego-power-icon.desktop.in.in	2010-07-08 11:07:52.402068944 -0700
+@@ -11,7 +11,7 @@
+ Comment=A power indicator
+ GenericName=A power indicator
+ NoDisplay=true
+-OnlyShowIn=MEEGO;
++OnlyShowIn=X-MEEGO-NB;
+ X-GNOME-Autostart-enable=true
+ X-Meego-Panel-Button-Style=state-80
+ X-Meego-Panel-Optional=false