Merge lp:~kelemeng/system-service/bug853354 into lp:system-service

[Gabor Kelemen]

[Michael Vogt (mvo)]

Looks great, thanks a bunch!

review: Approve

=== removed file 'backend/Makefile'
--- backend/Makefile	2008-07-23 10:51:10 +0000
+++ backend/Makefile	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-
-com.ubuntu.systemservice.policy: com.ubuntu.systemservice.policy.in
-	intltool-merge -x ../po $< $@

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2011-09-18 17:14:24 +0000
@@ -0,0 +1,9 @@
+[build]
+i18n=True
+
+[build_i18n]
+domain=system-service
+xml_files=[ ("share/polkit-1/actions/",
+             ("backend/com.ubuntu.systemservice.policy.in",)
+	    )
+          ]

=== modified file 'setup.py'
--- setup.py	2009-07-14 11:18:58 +0000
+++ setup.py	2011-09-18 17:14:24 +0000
@@ -5,8 +5,6 @@
 import os
 from DistUtilsExtra.command import *
 
-os.system("cd backend ; make")
-
 setup(name='system-service',
       version='0.1.6',
       packages = ['UbuntuSystemService',
@@ -19,8 +17,6 @@
                    ["backend/com.ubuntu.SystemService.conf"]),
                   ('lib/system-service/',
                    ["backend/system-service-d"]),
-                  ('share/polkit-1/actions/',
-                   ["backend/com.ubuntu.systemservice.policy"]),
                   ],
       cmdclass = { "build" : build_extra.build_extra,
                    "build_i18n" :  build_i18n.build_i18n,