desktopcouch

Merge lp://qastaging/~ken-vandine/desktopcouch/with_the_pita_distutils into lp://qastaging/desktopcouch

  1. with_the_pita_distutils
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Elliot Murphy
Approved revision: 39
Merged at revision: not available
Proposed branch: lp://qastaging/~ken-vandine/desktopcouch/with_the_pita_distutils
Merge into: lp://qastaging/desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~ken-vandine/desktopcouch/with_the_pita_distutils
Reviewer Review Type Date Requested Status
Elliot Murphy (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+10414@code.qastaging.launchpad.net

Commit message

auto python build stuff in distutils extra.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

This finishes the work dobey started, removing the dep on the auto python build stuff in distutils extra.

Revision history for this message
Eric Casteleijn (thisfred) wrote :

Changes look good, and the tests all still pass.

review: Approve
Revision history for this message
Elliot Murphy (statik) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'po/POTFILES.in'
--- po/POTFILES.in 1970-01-01 00:00:00 +0000
+++ po/POTFILES.in 2009-08-19 19:14:24 +0000
@@ -0,0 +1,2 @@
1desktopcouch-pair.desktop.in
2bin/desktopcouch-pair
03
=== added file 'setup.cfg'
--- setup.cfg 1970-01-01 00:00:00 +0000
+++ setup.cfg 2009-08-19 19:14:24 +0000
@@ -0,0 +1,13 @@
1[egg_info]
2tag_build =
3tag_date = 0
4tag_svn_revision = 0
5
6[build]
7i18n=True
8icons=True
9
10[build_i18n]
11domain=desktopcouch
12desktop_files=[("share/applications", ("desktopcouch-pair.desktop.in",))]
13
014
=== modified file 'setup.py'
--- setup.py 2009-08-17 21:39:48 +0000
+++ setup.py 2009-08-19 19:14:24 +0000
@@ -18,18 +18,25 @@
18"""setup.py"""18"""setup.py"""
1919
20from setuptools import setup, find_packages20from setuptools import setup, find_packages
21from DistUtilsExtra.command import *
2122
22setup(23setup(
23 name='desktopcouch',24 name='desktopcouch',
24 version='0.2',25 version='0.3',
25 description='A Desktop CouchDB instance.',26 description='A Desktop CouchDB instance.',
26 url='https://launchpad.net/desktopcouch',27 url='https://launchpad.net/desktopcouch',
27 license='LGPL-3',28 license='LGPL-3',
28 author='Stuart Langridge',29 author='Stuart Langridge',
29 author_email='stuart.langridge@canonical.com',30 author_email='stuart.langridge@canonical.com',
30 packages=find_packages(),31 packages=find_packages(),
32 scripts=['bin/desktopcouch-pair'],
31 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',33 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
32 'bin/desktopcouch-stop']),34 'bin/desktopcouch-stop']),
33 ('/usr/share/doc/python-desktopcouch-records/api/',35 ('/usr/share/doc/python-desktopcouch-records/api/',
34 ['desktopcouch/records/doc/records.txt'])],36 ['desktopcouch/records/doc/records.txt']),
37 ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),
38 ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']),
39 ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],
40 cmdclass = { "build" : build_extra.build_extra,
41 "build_i18n" : build_i18n.build_i18n }
35)42)

Subscribers

People subscribed via source and target branches