desktopcouch

Merge lp:~cmiller/desktopcouch/distutils-manifest-update into lp:desktopcouch

  1. distutils-manifest-update
  2. Merge into trunk
Proposed by Chad Miller
Status: Merged
Approved by: Stuart Langridge
Approved revision: 89
Merged at revision: not available
Proposed branch: lp:~cmiller/desktopcouch/distutils-manifest-update
Merge into: lp:desktopcouch
Diff against target: 47 lines
2 files modified
MANIFEST.in (+3/-1)
setup.py (+6/-4)
To merge this branch: bzr merge lp:~cmiller/desktopcouch/distutils-manifest-update
Reviewer Review Type Date Requested Status
Stuart Langridge (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+13218@code.launchpad.net

Commit message

Release 0.4.4.

Include missing files in MANIFEST.in (for "sdist" sources tarballs) and in setup.py (for binary installations).

To post a comment you must log in.
lp:~cmiller/desktopcouch/distutils-manifest-update updated
89. By C Miller <email address hidden>

Add new(ish) files to be installed by distutils' setup.py.

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

Looks fine

review: Approve
Revision history for this message
Stuart Langridge (sil) wrote :

Seems good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2009-09-11 19:08:53 +0000
3+++ MANIFEST.in 2009-10-12 13:57:11 +0000
4@@ -1,10 +1,12 @@
5 include COPYING COPYING.LESSER README
6 recursive-include data *.tmpl
7 include desktopcouch-pair.desktop.in
8+include setup.cfg
9 include po/POTFILES.in
10 include start-desktop-couchdb.sh
11 include stop-desktop-couchdb.sh
12-include desktopcouch/records/doc/records.txt
13+recursive-include desktopcouch *.txt
14+recursive-include po *.pot
15 include bin/*
16 include docs/man/*
17 include MANIFEST.in MANIFEST
18
19=== modified file 'setup.py'
20--- setup.py 2009-10-09 17:29:06 +0000
21+++ setup.py 2009-10-12 13:57:11 +0000
22@@ -22,7 +22,7 @@
23
24 setup(
25 name='desktopcouch',
26- version='0.4.3',
27+ version='0.4.4',
28 description='A Desktop CouchDB instance.',
29 url='https://launchpad.net/desktopcouch',
30 license='LGPL-3',
31@@ -32,11 +32,13 @@
32 scripts=['bin/desktopcouch-pair'],
33 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
34 'bin/desktopcouch-stop']),
35+ # Be sure all additions are reflected in MANIFEST.in !
36 ('/usr/share/doc/python-desktopcouch-records/api/',
37- ['desktopcouch/records/doc/records.txt']),
38- # System-level XDG_CONFIG_DIRS folder
39+ ['desktopcouch/records/doc/records.txt',
40+ 'desktopcouch/records/doc/field_registry.txt',
41+ 'desktopcouch/contacts/schema.txt']),
42 ('/etc/xdg/desktop-couch/',
43- ['config/desktop-couch/compulsory-auth.ini']),
44+ ['config/desktop-couch/compulsory-auth.ini']),
45 ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),
46 ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']),
47 ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],

Subscribers

People subscribed via source and target branches