[fusion-commits] Compizconfig Settings Manager in Python: Changes to 'master' (06b5c6ad38551d56b45ce456bef2e24e6d9427d7)

[marex at server.opencompositing.org]

New commits:
commit 06b5c6ad38551d56b45ce456bef2e24e6d9427d7
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 10 19:07:04 2008 +0200

    Fixed translation for desktop file, thanks to Milo Casagrande


 MANIFEST.in     |    2 +-
 ccsm.desktop    |    9 ---------
 ccsm.desktop.in |    9 +++++++++
 po/POTFILES.in  |    1 +
 po/ccsm.pot     |    5 ++++-
 setup.py        |    5 +++++
 6 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 ccsm.desktop
 create mode 100644 ccsm.desktop.in


Modified: fusion/compizconfig/ccsm/MANIFEST.in
===================================================================
--- fusion/compizconfig/ccsm/MANIFEST.in
+++ fusion/compizconfig/ccsm/MANIFEST.in
@@ -1,6 +1,6 @@
 include po/*
 include TODO README INSTALL AUTHORS COPYING LICENSE NEWS VERSION ChangeLog
-include ccsm.desktop
+include ccsm.desktop.in
 include ccm/Constants.py.in
 include Makefile MANIFEST.in
 recursive-include images *

Modified: fusion/compizconfig/ccsm/ccsm.desktop
deleted file mode 100644
===================================================================
--- fusion/compizconfig/ccsm/ccsm.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=CompizConfig Settings Manager
-Comment=Configure Compiz with CompizConfig
-Icon=ccsm
-Exec=ccsm
-Terminal=false
-Type=Application
-Categories=Compiz;Settings;DesktopSettings;

Modified: fusion/compizconfig/ccsm/ccsm.desktop.in
new file mode 100644
===================================================================
--- /dev/null
+++ fusion/compizconfig/ccsm/ccsm.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=CompizConfig Settings Manager
+_Comment=Configure Compiz with CompizConfig
+Icon=ccsm
+Exec=ccsm
+Terminal=false
+Type=Application
+Categories=Compiz;Settings;DesktopSettings;

Modified: fusion/compizconfig/ccsm/po/POTFILES.in
===================================================================
--- fusion/compizconfig/ccsm/po/POTFILES.in
+++ fusion/compizconfig/ccsm/po/POTFILES.in
@@ -7,3 +7,4 @@ ccm/Pages.py
 ccm/Utils.py
 ccm/__init__.py
 ccsm
+ccsm.desktop.in

Modified: fusion/compizconfig/ccsm/po/ccsm.pot
===================================================================
--- fusion/compizconfig/ccsm/po/ccsm.pot
+++ fusion/compizconfig/ccsm/po/ccsm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.opencompositing.org\n"
-"POT-Creation-Date: 2008-05-02 13:46+0530\n"
+"POT-Creation-Date: 2008-05-10 18:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -484,3 +484,6 @@ msgid ""
 "\n"
 " Your filter \"<b>%s</b>\" does not match any items.</span>"
 msgstr ""
+
+msgid "Configure Compiz with CompizConfig"
+msgstr ""

Modified: fusion/compizconfig/ccsm/setup.py
===================================================================
--- fusion/compizconfig/ccsm/setup.py
+++ fusion/compizconfig/ccsm/setup.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import sys, os, glob
+import subprocess
 from stat import *
 from distutils.core import setup
 from distutils.command.install import install as _install
@@ -110,6 +111,10 @@ f = open (os.path.join ("ccm/Constants.py"), "wt")
 f.write (data)
 f.close ()
 
+cmd = "intltool-merge -d -u po/ ccsm.desktop.in ccsm.desktop".split(" ")
+proc = subprocess.Popen(cmd)
+proc.wait()
+
 custom_images = []
 
 data_files = [