[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, debian, updated. debian/0-git20080909-1-34-g0e61cef

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit f8f1722b8d3b96867389c7e584117feed1572c88
Merge: d89bba9ff73c97a826261992bd59276adff60283 baee0fd17828f3ec4c515b829548876061caf2e8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 11 17:55:06 2008 +0100

    Merge branch 'upstream-dist' into debian

diff --combined setup.py
index 83becec,df59afc..040bf2b
--- a/setup.py
+++ b/setup.py
@@@ -11,7 -11,7 +11,7 @@@ class my_build(_build)
  
          # compile theme files
          import subprocess
-         result = subprocess.call( "cd ./data/themes; edje_cc -v -id ../images -fd ../fonts zhone.edc", shell=True )
+         result = subprocess.call( "cd ./data/themes/toby; edje_cc -v -fd ../fonts zhone.edc; mv zhone.edj ../", shell=True )
          if result != 0:
              raise Exception( "Can't build theme files. Built edje_cc?" )
  
@@@ -36,8 -36,8 +36,8 @@@ setup
                   'clean'    : my_clean  },
      scripts = [ "src/zhone" ],
      data_files = [
 -        ( "zhone/", ["data/themes/zhone.edj"] ),
 -        ( "pixmaps", ["data/launcher/zhone.png"] ),
 -        ( "applications", ["data/launcher/zhone.desktop"] ),
 +        ( "share/zhone/", ["data/themes/zhone.edj"] ),
 +        ( "share/pixmaps", ["data/launcher/zhone.png"] ),
 +        ( "share/applications", ["data/launcher/zhone.desktop"] ),
          ]
  )

-- 
freesmartphone.org demo GUI