merging Tizen:Main version with Tizen:IVI version to sync it up for Tizen:Devel:IVI

diff --git a/packaging/device-config-touch.changes b/packaging/device-config-touch.changes
index 62b2b51..dff415b 100644 (file)
--- a/packaging/device-config-touch.changes
+++ b/packaging/device-config-touch.changes
@@ -1,9 +1,35 @@
-* Wed May 30 - Zhang Qiang <qiang.z.zhang@intel.con> - 1
-- Clean up spec file for packaging
+* Tue Oct  9 21:55:43 UTC 2012 - tracy.graydon@intel.com
+- Merging Tizen:Main version with IVI version to pick up maifest 
 
-* Sat May 19 05:48:21 UTC 2012 - tracy.graydon@intel.com
-- Fix packaging 
+* Fri Aug 3 2012 Brad Peters <brad.t.peters@intel.com>
+- Flipping MT input to support a left rotation of display
 
-* Sat May 19 00:12:56 UTC 2012 - tu.c.truong@intel.com
-- Initial commit to Gerrit
+* Tue Jul 31 2012 Austin Zhang <austin.zhang@intel.com>
+- Add calibration params for atmel_mxt224 
+
+* Fri Jul 27 2012 Austin Zhang <austin.zhang@intel.com>
+- Change input driver for Cando 10.1 Multi panel to evdev-multitouch so
+  that we use same way to support multitouch
+
+* Wed Jul 18 2012 Austin Zhang <austin.zhang@intel.com>
+- Change input driver for Atmel mxt224 panel to evdev-multitouch so
+  that we use same way to support multitouch
+
+* Mon Jul 02 2012 William Douglas <william.douglas@intel.com> build/2012-06-27.022457@fe24c24
+- use /etc not /opt/etc
+
+* Tue Jun 26 2012 Austin Zhang <austin.zhang@intel.com> build/2012-06-27.022457@28917cf
+- Added one Atmel panel config file, release to OBS
+
+* Thu Jun 07 2012 Austin, Zhang <austin.zhang@intel.com> build/2012-06-27.022457@d07a13a
+- Added Atmel maXTouch mtev support
+
+* Tue May 29 2012 Ryan Ware <ryan.r.ware@intel.com> build/2012-06-27.022457@70015be
+- Add default Smack manifest for device-config-touch.spec
+
+* Fri May 18 2012 Zhang Qiang <qiang.z.zhang@intel.com> build/2012-06-27.022457@d5cce11
+- Initial code release
+
+* Fri Apr 27 2012 eunmee moon <eunmee.moon@samsung.com> build/2012-06-27.022457@c6ea29a
+- Initial empty repository
 

diff --git a/packaging/device-config-touch.manifest b/packaging/device-config-touch.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/device-config-touch.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/device-config-touch.spec b/packaging/device-config-touch.spec
index b391ce7..5c4dda4 100644 (file)
--- a/packaging/device-config-touch.spec
+++ b/packaging/device-config-touch.spec
@@ -5,6 +5,9 @@ Summary:        Device specific configurations for Touch
 Group:          System/Hardware
 License:        GPLv2+
 Source0:       %{name}-%{version}.tar.bz2
+Source1001: packaging/device-config-touch.manifest 
+# >> gbp-patch-tags         # auto-added by gbp
+# << gbp-patch-tags         # auto-added by gbp
 BuildArch: noarch
 
 %description
@@ -20,38 +23,49 @@ Touch configuration files for %1.\
 
 
 %prep
-%setup -q %{name}-%{version}
-
+%setup -q
+# >> gbp-apply-patches    # auto-added by gbp
+# << gbp-apply-patches    # auto-added by gbp
 %build
+cp %{SOURCE1001} .
 
 %install
 
-mkdir -p %{buildroot}/opt/etc/X11/xorg.conf.d
-for f in `ls -1  *.conf`; do
-       install -m 0644 $f %{buildroot}/opt/etc/X11/xorg.conf.d/
-done
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
+install -m 0644 *.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 
 %touch_package cando
 %files cando
-/opt/etc/X11/xorg.conf.d/60-cando-mtev.conf
+%{_sysconfdir}/X11/xorg.conf.d/60-cando-evdevmultitouch.conf
+%manifest device-config-touch.manifest
 
 %touch_package mxt224
 %files mxt224
-/opt/etc/X11/xorg.conf.d/60-mxt224-mtev.conf
+%{_sysconfdir}/X11/xorg.conf.d/60-mxt224-evdevmultitouch.conf
+%manifest device-config-touch.manifest
+
+%touch_package Atmel
+%files Atmel
+%manifest device-config-touch.manifest
+%{_sysconfdir}/X11/xorg.conf.d/65-Atmel-mtev.conf
 
 %touch_package sitronix
 %files sitronix
-/opt/etc/X11/xorg.conf.d/70-sitronix-mtev.conf
+%{_sysconfdir}/X11/xorg.conf.d/70-sitronix-mtev.conf
+%manifest device-config-touch.manifest
 
 %touch_package Hanvon
 %files Hanvon
-/opt/etc/X11/xorg.conf.d/80-Hanvon-mtev.conf
+%{_sysconfdir}/X11/xorg.conf.d/80-Hanvon-mtev.conf
+%manifest device-config-touch.manifest
 
 %touch_package ILI
 %files ILI
-/opt/etc/X11/xorg.conf.d/90-ILI-mtev.conf
+%{_sysconfdir}/X11/xorg.conf.d/90-ILI-mtev.conf
+%manifest device-config-touch.manifest
 
 %touch_package eGalax
 %files eGalax
-/opt/etc/X11/xorg.conf.d/92-exopc-mtev.conf
+%{_sysconfdir}/X11/xorg.conf.d/92-exopc-mtev.conf
+%manifest device-config-touch.manifest