Merge lp:~jbicha/software-properties/use-distutils-extra-auto into lp:software-properties

[Jeremy Bícha]

[Martin Pitt (pitti)]

This looks good, thanks! Merging but not uploading as it doesn't have an actual effect at runtime.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-26 11:31:53 +0000
+++ debian/changelog	2013-07-20 01:55:30 +0000
@@ -1,3 +1,9 @@
+software-properties (0.92.25) UNRELEASED; urgency=low
+
+  * Use python-distutils-extra in auto mode
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 19 Jul 2013 21:40:58 -0400
+
 software-properties (0.92.24) saucy; urgency=low
 
   * tests/test_dbus.py: Be slightly more tolerant in test_updates_interval,

=== modified file 'setup.py'
--- setup.py	2012-12-12 08:12:41 +0000
+++ setup.py	2013-07-20 01:55:30 +0000
@@ -2,6 +2,7 @@
 
 from setuptools import setup
 import glob
+from DistUtilsExtra.auto import *
 from DistUtilsExtra.command import *
 
 setup(name='software-properties',
@@ -18,25 +19,9 @@
                'add-apt-repository',
                ],
       data_files=[
-                  ("../etc/dbus-1/system.d/",
-                   ["data/com.ubuntu.SoftwareProperties.conf"]
-                  ),
-                  ("share/dbus-1/system-services/",
-                   ["data/com.ubuntu.SoftwareProperties.service"]
-                  ),
-                  ('share/software-properties/designer',
-                   glob.glob("data/designer/*.ui")
-                  ),
-                  ('share/software-properties/gtkbuilder',
-                   glob.glob("data/gtkbuilder/*.ui")
-                  ),
                   ('lib/software-properties/',
                    ['software-properties-dbus', ]
                   ),
                   ],
-      cmdclass = { "build" : build_extra.build_extra,
-                   "build_i18n" :  build_i18n.build_i18n,
-#                   "build_help" :  build_help.build_help,
-                   "build_icons" :  build_icons.build_icons },
       test_suite="tests",
      )