[meego-commits] 14527: Changes to devel:devices:n900/nokia-n900-configs

[Sami Sirkia]

Hi,
I have made the following changes to nokia-n900-configs in project devel:devices:n900. Please review and accept ASAP.

Thank You,
Sami Sirkia

[This message was auto-generated]

---

Request #14527:

  submit:   home:sami.sirkia:branches:devel:devices:n900/nokia-n900-configs(r3)(cleanup) -> devel:devices:n900/nokia-n900-configs


Message:
    * Fri Mar 4 2011 Sami Sirkia <sami.sirkia at cybercom.com> - 0.6.16
- Removed /usr/bin/n900-alsamixer-set-*.sh as unnecessary.
- Removed /etc/asound_n900.state, init.d/n900-alsamixer-settings as unnecessary.
  Alsa settings are initialized and handled by resource policy.

State:   new          2011-03-04T04:04:59 sami.sirkia
Comment: None



changes files:
--------------
--- nokia-n900-configs.changes
+++ nokia-n900-configs.changes
@@ -0,0 +1,5 @@
+* Fri Mar 4 2011 Sami Sirkia <sami.sirkia at cybercom.com> - 0.6.16
+- Removed /usr/bin/n900-alsamixer-set-*.sh as unnecessary.
+- Removed /etc/asound_n900.state, init.d/n900-alsamixer-settings as unnecessary.
+  Alsa settings are initialized and handled by resource policy.
+

old:
----
  asound_n900.state
  n900-alsamixer-set-dmic.sh
  n900-alsamixer-set-earpiece.sh
  n900-alsamixer-set-fm_off.sh
  n900-alsamixer-set-fm_on.sh
  n900-alsamixer-set-fmrx_bypass.sh
  n900-alsamixer-set-fmtx.sh
  n900-alsamixer-set-headphone.sh
  n900-alsamixer-set-headset_mic.sh
  n900-alsamixer-set-shutdown.sh
  n900-alsamixer-set-speakers.sh
  n900-alsamixer-settings.init

spec files:
-----------
--- nokia-n900-configs.spec
+++ nokia-n900-configs.spec
@@ -7,7 +7,7 @@
 
 Name:       nokia-n900-configs
 Summary:    Provides configs for Nokia N900
-Version:    0.6.15
+Version:    0.6.16
 Release:    0
 Group:      System/Base
 License:    GPLv2
@@ -17,22 +17,10 @@
 Source2:    nokia-n900-keys.map
 Source3:    nokia-n900-keys.init
 Source4:    default.pa
-Source5:    asound_n900.state
-Source6:    n900-alsamixer-settings.init
-Source7:    n900-alsamixer-set-shutdown.sh
-Source8:    n900-alsamixer-set-speakers.sh
-Source9:    n900-alsamixer-set-dmic.sh
-Source10:    n900-alsamixer-set-earpiece.sh
-Source11:    n900-alsamixer-set-headphone.sh
-Source12:    n900-alsamixer-set-headset_mic.sh
-Source13:    n900-alsamixer-set-fm_off.sh
-Source14:    n900-alsamixer-set-fm_on.sh
-Source15:    n900-alsamixer-set-fmrx_bypass.sh
-Source16:    n900-alsamixer-set-fmtx.sh
-Source17:    nokia-n900-cmt-gpio.init
-Source18:    nokia-n900-force-backlight.desktop
-Source19:    n900-setbacklight.sh
-Source20:    pipelines.conf
+Source5:    nokia-n900-cmt-gpio.init
+Source6:    nokia-n900-force-backlight.desktop
+Source7:    n900-setbacklight.sh
+Source8:    pipelines.conf
 Source100:  nokia-n900-configs.yaml
 Requires:   udev-rules-nokia-n900
 Requires:   alsa-utils
@@ -78,24 +66,12 @@
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nokia-n900-keys
 
 install -D -m 755 %{SOURCE4}  $RPM_BUILD_ROOT/etc/skel/.pulse/default.pa
-install -D -m 644 %{SOURCE5}  $RPM_BUILD_ROOT/etc/asound_n900.state
-install -D -m 755 %{SOURCE6}  $RPM_BUILD_ROOT/etc/rc.d/init.d/n900-alsamixer-settings
-install -D -m 755 %{SOURCE7}  $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-shutdown.sh
-install -D -m 755 %{SOURCE8}  $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-speakers.sh
-install -D -m 755 %{SOURCE9}  $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-dmic.sh
-install -D -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-earpiece.sh
-install -D -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-headphone.sh
-install -D -m 755 %{SOURCE12} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-headset_mic.sh
-install -D -m 755 %{SOURCE13} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-fm_off.sh
-install -D -m 755 %{SOURCE14} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-fm_on.sh
-install -D -m 755 %{SOURCE15} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-fmrx_bypass.sh
-install -D -m 755 %{SOURCE16} $RPM_BUILD_ROOT/usr/bin/n900-alsamixer-set-fmtx.sh
-
-install -D -m 644 %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/nokia-n900-cmt-gpio
-install -D -m 644 %{SOURCE18} $RPM_BUILD_ROOT/etc/xdg/autostart/n900-force-backlight.desktop
-install -D -m 755 %{SOURCE19} $RPM_BUILD_ROOT/usr/bin/n900-setbacklight.sh
 
-install -D -m 644 %{SOURCE20} $RPM_BUILD_ROOT/etc/camera/pipelines.conf
+install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/nokia-n900-cmt-gpio
+install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/xdg/autostart/n900-force-backlight.desktop
+install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/bin/n900-setbacklight.sh
+
+install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/camera/pipelines.conf
 # << install post
 
 
@@ -103,7 +79,6 @@
 # >> preun
 if [ "$1" -eq 0 ]; then
 [ -e /sbin/chkconfig ] && /sbin/chkconfig --del nokia-n900-keys
-[ -e /sbin/chkconfig ] && /sbin/chkconfig --del n900-alsamixer-settings
 [ -e /sbin/chkconfig ] && /sbin/chkconfig --del nokia-n900-cmt-gpio
 fi
 # << preun
@@ -111,7 +86,6 @@
 %post
 # >> post
 [ -e /sbin/chkconfig ] && /sbin/chkconfig --add nokia-n900-keys
-[ -e /sbin/chkconfig ] && /sbin/chkconfig --add n900-alsamixer-settings
 [ -e /sbin/chkconfig ] && /sbin/chkconfig --add nokia-n900-cmt-gpio
 # << post
 
@@ -129,26 +103,12 @@
 %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/nokia-n900-cmt-gpio
 # Pulseaudio
 %attr(755,root,root) %config %{_sysconfdir}/skel/.pulse/default.pa
-%config %{_sysconfdir}/asound_n900.state
-# Alsa
-%defattr(755,root,root,-)
-%{_sysconfdir}/rc.d/init.d/n900-alsamixer-settings
-%{_bindir}/n900-alsamixer-set-shutdown.sh
-%{_bindir}/n900-alsamixer-set-speakers.sh
-%{_bindir}/n900-alsamixer-set-dmic.sh
-%{_bindir}/n900-alsamixer-set-earpiece.sh
-%{_bindir}/n900-alsamixer-set-headphone.sh
-%{_bindir}/n900-alsamixer-set-headset_mic.sh
-%{_bindir}/n900-alsamixer-set-fm_off.sh
-%{_bindir}/n900-alsamixer-set-fm_on.sh
-%{_bindir}/n900-alsamixer-set-fmrx_bypass.sh
-%{_bindir}/n900-alsamixer-set-fmtx.sh
-%{_bindir}/n900-setbacklight.sh
-%defattr(644,root,root,-)
+# Backlight
+%attr(755,root,root) %{_bindir}/n900-setbacklight.sh
 # Camera
-%config %{_sysconfdir}/camera/pipelines.conf
+%attr(644,root,root) %config %{_sysconfdir}/camera/pipelines.conf
 # Misc
-%config %{_sysconfdir}/xdg/autostart/n900-force-backlight.desktop
+%attr(644,root,root) %config %{_sysconfdir}/xdg/autostart/n900-force-backlight.desktop
 # << files
 
 

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

++++++ nokia-n900-configs.yaml
--- nokia-n900-configs.yaml
+++ nokia-n900-configs.yaml
@@ -1,6 +1,6 @@
 Name: nokia-n900-configs
 Summary: Provides configs for Nokia N900
-Version: 0.6.15
+Version: 0.6.16
 Release: 0
 Group: System/Base
 License: GPLv2
@@ -10,18 +10,6 @@
     - nokia-n900-keys.map
     - nokia-n900-keys.init
     - default.pa
-    - asound_n900.state
-    - n900-alsamixer-settings.init
-    - n900-alsamixer-set-shutdown.sh
-    - n900-alsamixer-set-speakers.sh
-    - n900-alsamixer-set-dmic.sh
-    - n900-alsamixer-set-earpiece.sh
-    - n900-alsamixer-set-headphone.sh
-    - n900-alsamixer-set-headset_mic.sh
-    - n900-alsamixer-set-fm_off.sh
-    - n900-alsamixer-set-fm_on.sh
-    - n900-alsamixer-set-fmrx_bypass.sh
-    - n900-alsamixer-set-fmtx.sh
     - nokia-n900-cmt-gpio.init
     - nokia-n900-force-backlight.desktop
     - n900-setbacklight.sh

++++++ deleted files:
--- asound_n900.state
--- n900-alsamixer-set-dmic.sh
--- n900-alsamixer-set-earpiece.sh
--- n900-alsamixer-set-fm_off.sh
--- n900-alsamixer-set-fm_on.sh
--- n900-alsamixer-set-fmrx_bypass.sh
--- n900-alsamixer-set-fmtx.sh
--- n900-alsamixer-set-headphone.sh
--- n900-alsamixer-set-headset_mic.sh
--- n900-alsamixer-set-shutdown.sh
--- n900-alsamixer-set-speakers.sh
--- n900-alsamixer-settings.init