[meego-packaging] [meego-commits] 9161: Changes to Trunk:Testing/xterm

[Selbak, Rolla N]

Hello Liu,   need more info...

handset uses icons-Applications-xterminal.png, but what about the other verticals?

Also why add this then comment this out?

+    #- icons-Applications-xterminal.png


Thanks,

rs

On 11/2/10 10:01 PM, "Liu Xinyun" <no_reply at build.meego.com> wrote:

Hi,
I have made the following changes to xterm in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Liu Xinyun

[This message was auto-generated]

---

Request #9161:

  submit:   home:xyl:branches:Trunk:Testing/xterm(r7)(cleanup) -> Trunk:Testing/xterm


Message:
    Fix BMC #8606. Handset uses icons-Applications-xterminal.png

State:   new          2010-11-02T22:01:50 xyl
Comment: None



changes files:
--------------
--- xterm.changes
+++ xterm.changes
@@ -0,0 +1,3 @@
+* Tue Nov 02 2010 Liu Xinyun <xinyun.liu at intel.com> - 261
+- Fix BMC #8606. Handset uses icons-Applications-xterminal.png
+

old:
----
  meego-xterm.png
  xterm.desktop

spec files:
-----------
--- xterm.spec
+++ xterm.spec
@@ -1,6 +1,6 @@
 #
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
 #
 # >> macros
 %define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
@@ -16,7 +16,6 @@
 Source0:    ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
 Source1:    ftp://invisible-island.net/xterm/16colors.txt
 Source2:    meego-%{name}.desktop
-Source3:    meego-%{name}.png
 Source100:  xterm.yaml
 Patch0:     xterm-261-resources.patch
 Patch1:     xterm-256-man-page_paths.patch
@@ -83,7 +82,7 @@

 cp -fp %{SOURCE1} 16colors.txt

-install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps
+#install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps

 # << install post
 desktop-file-install --delete-original       \

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

++++++ meego-xterm.desktop
--- meego-xterm.desktop
+++ meego-xterm.desktop
@@ -4,7 +4,7 @@
 GenericName=Terminal
 Comment=Terminal emulator for the X Window System
 Exec=xterm
-Icon=meego-xterm
+Icon=icons-Applications-xterminal
 Type=Application
 Categories=System;Utility;
 NoDisplay=false

++++++ xterm.yaml
--- xterm.yaml
+++ xterm.yaml
@@ -9,7 +9,7 @@
     - ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
     - ftp://invisible-island.net/xterm/16colors.txt
     - meego-%{name}.desktop
-    - meego-%{name}.png
+    #- icons-Applications-xterminal.png
 Patches:
     - xterm-261-resources.patch
     - xterm-256-man-page_paths.patch

++++++ deleted files:
--- meego-xterm.png
--- xterm.desktop

_______________________________________________
MeeGo-commits mailing list
MeeGo-commits at meego.com
http://lists.meego.com/listinfo/meego-commits