[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, debian, updated. debian/0-git20081111-1-24-gf22014e

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 3f4c56d28c0a929b6cd70861d09cac9eab3f9875
Merge: d54aa101d3835863b7c8d53d3efbeceedea700be b441af742c75c37e1b48a48559cf8743310f6301
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 21:24:12 2009 +0100

    Merge commit 'upstream/0-git20090202' into debian
    
    Conflicts:
    
    	setup.py

diff --combined setup.py
index 040bf2b,361bdc4..3f4feb7
--- a/setup.py
+++ b/setup.py
@@@ -24,7 -24,7 +24,7 @@@ class my_clean(_clean)
  
  setup(
      name = "zhone",
-     version = "milestone2+git",
+     version = "milestone4.1+git",
      author = "See AUTHORS",
      author_email = "mlauer at vanille-media.de",
      url = "http://www.freesmartphone.org",
@@@ -36,8 -36,9 +36,9 @@@
                   'clean'    : my_clean  },
      scripts = [ "src/zhone" ],
      data_files = [
-         ( "share/zhone/", ["data/themes/zhone.edj"] ),
 -        ( "zhone", ["data/themes/zhone.edj"] ),
 -        ( "zhone/locale/ru/LC_MESSAGES", ["data/locale/ru/LC_MESSAGES/zhone.mo"] ),
 -        ( "pixmaps", ["data/launcher/zhone.png"] ),
 -        ( "applications", ["data/launcher/zhone.desktop"] ),
++        ( "share/zhone", ["data/themes/zhone.edj"] ),
++        ( "locale/ru/LC_MESSAGES", ["data/locale/ru/LC_MESSAGES/zhone.mo"] ),
 +        ( "share/pixmaps", ["data/launcher/zhone.png"] ),
 +        ( "share/applications", ["data/launcher/zhone.desktop"] ),
          ]
  )

-- 
freesmartphone.org demo GUI