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
1=== added file 'po/POTFILES.in'
2--- po/POTFILES.in 1970-01-01 00:00:00 +0000
3+++ po/POTFILES.in 2009-08-19 19:14:24 +0000
4@@ -0,0 +1,2 @@
5+desktopcouch-pair.desktop.in
6+bin/desktopcouch-pair
7
8=== added file 'setup.cfg'
9--- setup.cfg 1970-01-01 00:00:00 +0000
10+++ setup.cfg 2009-08-19 19:14:24 +0000
11@@ -0,0 +1,13 @@
12+[egg_info]
13+tag_build =
14+tag_date = 0
15+tag_svn_revision = 0
16+
17+[build]
18+i18n=True
19+icons=True
20+
21+[build_i18n]
22+domain=desktopcouch
23+desktop_files=[("share/applications", ("desktopcouch-pair.desktop.in",))]
24+
25
26=== modified file 'setup.py'
27--- setup.py 2009-08-17 21:39:48 +0000
28+++ setup.py 2009-08-19 19:14:24 +0000
29@@ -18,18 +18,25 @@
30 """setup.py"""
31
32 from setuptools import setup, find_packages
33+from DistUtilsExtra.command import *
34
35 setup(
36 name='desktopcouch',
37- version='0.2',
38+ version='0.3',
39 description='A Desktop CouchDB instance.',
40 url='https://launchpad.net/desktopcouch',
41 license='LGPL-3',
42 author='Stuart Langridge',
43 author_email='stuart.langridge@canonical.com',
44 packages=find_packages(),
45+ scripts=['bin/desktopcouch-pair'],
46 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
47 'bin/desktopcouch-stop']),
48 ('/usr/share/doc/python-desktopcouch-records/api/',
49- ['desktopcouch/records/doc/records.txt'])],
50+ ['desktopcouch/records/doc/records.txt']),
51+ ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),
52+ ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']),
53+ ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],
54+ cmdclass = { "build" : build_extra.build_extra,
55+ "build_i18n" : build_i18n.build_i18n }
56 )

Subscribers

People subscribed via source and target branches