subdirs for subprojects

diff --git a/COPYING b/COPYING
deleted file mode 100644 (file)
index cc38897..0000000
--- a/COPYING
+++ /dev/null
@@ -1 +0,0 @@
-This is released under BSD licence, see debian/copyright for more details.

diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index 900ba98..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-INSTALL:
---------
-
-dpkg-buildpackage -rfakeroot -us -uc -sa -D
-dpkg -i ../cell-modem-ui*_armel.deb

diff --git a/README b/README
deleted file mode 100644 (file)
index 1289e45..0000000
--- a/README
+++ /dev/null
@@ -1,4 +0,0 @@
-cell-modem-ui:
---------------
-Installs a XML-file to /etc/systemui/ for controlling cellular modem.
-

diff --git a/cell-modem-ui-applet/TODO b/cell-modem-ui-applet/TODO
new file mode 100644 (file)
index 0000000..669d868
--- /dev/null
+++ b/cell-modem-ui-applet/TODO
@@ -0,0 +1 @@
+This is a placeholder for Control Panel Applet for cellular modem settings.

diff --git a/cell-modem-ui-powerkey/COPYING b/cell-modem-ui-powerkey/COPYING
new file mode 100644 (file)
index 0000000..cc38897
--- /dev/null
+++ b/cell-modem-ui-powerkey/COPYING
@@ -0,0 +1 @@
+This is released under BSD licence, see debian/copyright for more details.

diff --git a/cell-modem-ui-powerkey/INSTALL b/cell-modem-ui-powerkey/INSTALL
new file mode 100644 (file)
index 0000000..900ba98
--- /dev/null
+++ b/cell-modem-ui-powerkey/INSTALL
@@ -0,0 +1,5 @@
+INSTALL:
+--------
+
+dpkg-buildpackage -rfakeroot -us -uc -sa -D
+dpkg -i ../cell-modem-ui*_armel.deb

diff --git a/cell-modem-ui-powerkey/README b/cell-modem-ui-powerkey/README
new file mode 100644 (file)
index 0000000..1289e45
--- /dev/null
+++ b/cell-modem-ui-powerkey/README
@@ -0,0 +1,4 @@
+cell-modem-ui:
+--------------
+Installs a XML-file to /etc/systemui/ for controlling cellular modem.
+

diff --git a/cell-modem-ui-powerkey/debian/cell-modem-ui.install b/cell-modem-ui-powerkey/debian/cell-modem-ui.install
new file mode 100644 (file)
index 0000000..376a032
--- /dev/null
+++ b/cell-modem-ui-powerkey/debian/cell-modem-ui.install
@@ -0,0 +1 @@
+etc/systemui/*

diff --git a/cell-modem-ui-powerkey/debian/changelog b/cell-modem-ui-powerkey/debian/changelog
new file mode 100644 (file)
index 0000000..4adeb3a
--- /dev/null
+++ b/cell-modem-ui-powerkey/debian/changelog
@@ -0,0 +1,14 @@
+cell-modem-ui (0.2-1) unstable; urgency=low
+
+  * Revised priorities in XML
+  * Added icons for buttons
+  * Rewrote button texts
+  * Added disclaimer to control about requiring a reboot
+
+ -- Tuomo Tanskanen <tumi@tumi.fi>  Mon, 21 Dec 2009 01:12:48 +0200
+
+cell-modem-ui (0.1-1) unstable; urgency=low
+
+  * Initial version
+
+ -- Tuomo Tanskanen <tumi@tumi.fi>  Sun, 20 Dec 2009 22:46:20 +0200

diff --git a/cell-modem-ui-powerkey/debian/compat b/cell-modem-ui-powerkey/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/cell-modem-ui-powerkey/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/cell-modem-ui-powerkey/debian/control b/cell-modem-ui-powerkey/debian/control
new file mode 100644 (file)
index 0000000..6c5eb6b
--- /dev/null
+++ b/cell-modem-ui-powerkey/debian/control
@@ -0,0 +1,17 @@
+Source: cell-modem-ui
+Section: user/system
+Priority: optional
+Maintainer: Tuomo Tanskanen <tumi@tumi.fi>
+Build-Depends: debhelper (>= 4.1.0)
+Standards-Version: 3.8.0
+
+Package: cell-modem-ui
+Section: user/system
+Architecture: any
+Depends: ${shlibs:Depends}, osso-systemui (>= 0.2.0)
+Description: Add Activate/Deactivate phone buttons to powerkey menu
+ Enables switching cellular modem on or off individually, without
+ going to full Offline mode. Handy for having WLAN enabled, but
+ phone off (e.g. flights, hospitals).
+ Requires reboot (or "killall systemui") to activate.
+XB-Maemo-Display-Name: Cellular Modem Activation/Deactivation UI

diff --git a/cell-modem-ui-powerkey/debian/copyright b/cell-modem-ui-powerkey/debian/copyright
new file mode 100644 (file)
index 0000000..44b21b5
--- /dev/null
+++ b/cell-modem-ui-powerkey/debian/copyright
@@ -0,0 +1,27 @@
+Released under the terms of BSD License.
+
+Copyright: (c) 2009 Tuomo Tanskanen <tumi@tumi.fi>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Copyright holders nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/cell-modem-ui-powerkey/debian/rules b/cell-modem-ui-powerkey/debian/rules
new file mode 100755 (executable)
index 0000000..d1acf3e
--- /dev/null
+++ b/cell-modem-ui-powerkey/debian/rules
@@ -0,0 +1,66 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+config.status: configure
+       dh_testdir
+
+configure: configure-stamp
+
+configure-stamp:
+#      libtoolize --automake
+#      aclocal-1.7 || aclocal
+#      autoconf
+#      autoheader
+#      automake-1.7 --add-missing --foreign || automake --add-missing> --foreign
+       touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp:  config.status
+       dh_testdir
+       touch build-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp 
+       [ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif
+       rm -f configure Makefile.in aclocal.m4 configure-stamp build-stamp config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs config.h.in
+       dh_clean 
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k 
+       dh_installdirs
+       mkdir -p $(CURDIR)/debian/tmp/etc/systemui/
+       cp $(CURDIR)/etc/systemui/*.xml $(CURDIR)/debian/tmp/etc/systemui/
+
+binary-indep: build install
+
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs
+       dh_installdocs
+       dh_install -v --sourcedir=debian/tmp
+       dh_link
+       dh_strip --dbg-package=cell-modem-ui
+       dh_compress
+       dh_fixperms
+       dh_makeshlibs -V
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 

diff --git a/cell-modem-ui-powerkey/etc/systemui/cell-modem-ui.xml b/cell-modem-ui-powerkey/etc/systemui/cell-modem-ui.xml
new file mode 100644 (file)
index 0000000..b561933
--- /dev/null
+++ b/cell-modem-ui-powerkey/etc/systemui/cell-modem-ui.xml
@@ -0,0 +1,79 @@
+<powerkeymenu path="/">
+ <menuitem priority="425" name="Enable phone" visible="tablet_state">
+  <keyfile>/var/run/ssc</keyfile>
+  <callback service="com.nokia.phone.SSC"
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="launch_pin_query"
+       bus="system" 
+       autostart="true">
+    <argument type="boolean">true</argument>
+  </callback>
+  <icon>general_application_call</icon>
+ </menuitem>
+
+ <menuitem priority="425" name="Enable phone" visible="inactive">
+  <keyfile>/var/run/ssc</keyfile>
+  <callback service="com.nokia.phone.SSC"
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
+    <argument type="boolean">true</argument>
+  </callback>
+  <icon>general_application_call</icon>
+ </menuitem>
+
+ <menuitem priority="425" name="Disable phone" visible="online">
+  <keyfile>/var/run/ssc</keyfile>
+  <callback service="com.nokia.phone.SSC"
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
+    <argument type="boolean">false</argument>
+  </callback>
+  <icon>red_end_call</icon>
+ </menuitem>
+
+ <menuitem priority="425" name="Disable phone" visible="activation_pending">
+  <keyfile>/var/run/ssc</keyfile>
+  <callback service="com.nokia.phone.SSC"
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
+    <argument type="boolean">false</argument>
+  </callback>
+  <icon>red_end_call</icon>
+ </menuitem>
+
+ <menuitem priority="425" name="Disable phone" visible="activation_failed">
+  <keyfile>/var/run/ssc</keyfile>
+  <callback service="com.nokia.phone.SSC"
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
+    <argument type="boolean">false</argument>
+  </callback>
+  <icon>red_end_call</icon>
+ </menuitem>
+
+ <menuitem priority="425" name="Disable phone" visible="selection_failed">
+  <keyfile>/var/run/ssc</keyfile>
+  <callback service="com.nokia.phone.SSC"
+       path="/com/nokia/phone/SSC"
+       interface="com.nokia.phone.SSC" 
+       method="set_radio"
+       bus="system" 
+       autostart="true">
+    <argument type="boolean">false</argument>
+  </callback>
+  <icon>red_end_call</icon>
+ </menuitem>
+</powerkeymenu>

diff --git a/debian/cell-modem-ui.install b/debian/cell-modem-ui.install
deleted file mode 100644 (file)
index 376a032..0000000
--- a/debian/cell-modem-ui.install
+++ /dev/null
@@ -1 +0,0 @@
-etc/systemui/*

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 4adeb3a..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,14 +0,0 @@
-cell-modem-ui (0.2-1) unstable; urgency=low
-
-  * Revised priorities in XML
-  * Added icons for buttons
-  * Rewrote button texts
-  * Added disclaimer to control about requiring a reboot
-
- -- Tuomo Tanskanen <tumi@tumi.fi>  Mon, 21 Dec 2009 01:12:48 +0200
-
-cell-modem-ui (0.1-1) unstable; urgency=low
-
-  * Initial version
-
- -- Tuomo Tanskanen <tumi@tumi.fi>  Sun, 20 Dec 2009 22:46:20 +0200

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 6c5eb6b..0000000
--- a/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: cell-modem-ui
-Section: user/system
-Priority: optional
-Maintainer: Tuomo Tanskanen <tumi@tumi.fi>
-Build-Depends: debhelper (>= 4.1.0)
-Standards-Version: 3.8.0
-
-Package: cell-modem-ui
-Section: user/system
-Architecture: any
-Depends: ${shlibs:Depends}, osso-systemui (>= 0.2.0)
-Description: Add Activate/Deactivate phone buttons to powerkey menu
- Enables switching cellular modem on or off individually, without
- going to full Offline mode. Handy for having WLAN enabled, but
- phone off (e.g. flights, hospitals).
- Requires reboot (or "killall systemui") to activate.
-XB-Maemo-Display-Name: Cellular Modem Activation/Deactivation UI

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 44b21b5..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-Released under the terms of BSD License.
-
-Copyright: (c) 2009 Tuomo Tanskanen <tumi@tumi.fi>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Copyright holders nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index d1acf3e..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-config.status: configure
-       dh_testdir
-
-configure: configure-stamp
-
-configure-stamp:
-#      libtoolize --automake
-#      aclocal-1.7 || aclocal
-#      autoconf
-#      autoheader
-#      automake-1.7 --add-missing --foreign || automake --add-missing> --foreign
-       touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-       [ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-       rm -f configure Makefile.in aclocal.m4 configure-stamp build-stamp config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs config.h.in
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-       mkdir -p $(CURDIR)/debian/tmp/etc/systemui/
-       cp $(CURDIR)/etc/systemui/*.xml $(CURDIR)/debian/tmp/etc/systemui/
-
-binary-indep: build install
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_install -v --sourcedir=debian/tmp
-       dh_link
-       dh_strip --dbg-package=cell-modem-ui
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs -V
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

diff --git a/etc/systemui/cell-modem-ui.xml b/etc/systemui/cell-modem-ui.xml
deleted file mode 100644 (file)
index b561933..0000000
--- a/etc/systemui/cell-modem-ui.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<powerkeymenu path="/">
- <menuitem priority="425" name="Enable phone" visible="tablet_state">
-  <keyfile>/var/run/ssc</keyfile>
-  <callback service="com.nokia.phone.SSC"
-       path="/com/nokia/phone/SSC"
-       interface="com.nokia.phone.SSC" 
-       method="launch_pin_query"
-       bus="system" 
-       autostart="true">
-    <argument type="boolean">true</argument>
-  </callback>
-  <icon>general_application_call</icon>
- </menuitem>
-
- <menuitem priority="425" name="Enable phone" visible="inactive">
-  <keyfile>/var/run/ssc</keyfile>
-  <callback service="com.nokia.phone.SSC"
-       path="/com/nokia/phone/SSC"
-       interface="com.nokia.phone.SSC" 
-       method="set_radio"
-       bus="system" 
-       autostart="true">
-    <argument type="boolean">true</argument>
-  </callback>
-  <icon>general_application_call</icon>
- </menuitem>
-
- <menuitem priority="425" name="Disable phone" visible="online">
-  <keyfile>/var/run/ssc</keyfile>
-  <callback service="com.nokia.phone.SSC"
-       path="/com/nokia/phone/SSC"
-       interface="com.nokia.phone.SSC" 
-       method="set_radio"
-       bus="system" 
-       autostart="true">
-    <argument type="boolean">false</argument>
-  </callback>
-  <icon>red_end_call</icon>
- </menuitem>
-
- <menuitem priority="425" name="Disable phone" visible="activation_pending">
-  <keyfile>/var/run/ssc</keyfile>
-  <callback service="com.nokia.phone.SSC"
-       path="/com/nokia/phone/SSC"
-       interface="com.nokia.phone.SSC" 
-       method="set_radio"
-       bus="system" 
-       autostart="true">
-    <argument type="boolean">false</argument>
-  </callback>
-  <icon>red_end_call</icon>
- </menuitem>
-
- <menuitem priority="425" name="Disable phone" visible="activation_failed">
-  <keyfile>/var/run/ssc</keyfile>
-  <callback service="com.nokia.phone.SSC"
-       path="/com/nokia/phone/SSC"
-       interface="com.nokia.phone.SSC" 
-       method="set_radio"
-       bus="system" 
-       autostart="true">
-    <argument type="boolean">false</argument>
-  </callback>
-  <icon>red_end_call</icon>
- </menuitem>
-
- <menuitem priority="425" name="Disable phone" visible="selection_failed">
-  <keyfile>/var/run/ssc</keyfile>
-  <callback service="com.nokia.phone.SSC"
-       path="/com/nokia/phone/SSC"
-       interface="com.nokia.phone.SSC" 
-       method="set_radio"
-       bus="system" 
-       autostart="true">
-    <argument type="boolean">false</argument>
-  </callback>
-  <icon>red_end_call</icon>
- </menuitem>
-</powerkeymenu>