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
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2009-09-11 19:08:53 +0000
+++ MANIFEST.in 2009-10-12 13:57:11 +0000
@@ -1,10 +1,12 @@
1include COPYING COPYING.LESSER README1include COPYING COPYING.LESSER README
2recursive-include data *.tmpl2recursive-include data *.tmpl
3include desktopcouch-pair.desktop.in3include desktopcouch-pair.desktop.in
4include setup.cfg
4include po/POTFILES.in5include po/POTFILES.in
5include start-desktop-couchdb.sh6include start-desktop-couchdb.sh
6include stop-desktop-couchdb.sh7include stop-desktop-couchdb.sh
7include desktopcouch/records/doc/records.txt8recursive-include desktopcouch *.txt
9recursive-include po *.pot
8include bin/*10include bin/*
9include docs/man/*11include docs/man/*
10include MANIFEST.in MANIFEST12include MANIFEST.in MANIFEST
1113
=== modified file 'setup.py'
--- setup.py 2009-10-09 17:29:06 +0000
+++ setup.py 2009-10-12 13:57:11 +0000
@@ -22,7 +22,7 @@
2222
23setup(23setup(
24 name='desktopcouch',24 name='desktopcouch',
25 version='0.4.3',25 version='0.4.4',
26 description='A Desktop CouchDB instance.',26 description='A Desktop CouchDB instance.',
27 url='https://launchpad.net/desktopcouch',27 url='https://launchpad.net/desktopcouch',
28 license='LGPL-3',28 license='LGPL-3',
@@ -32,11 +32,13 @@
32 scripts=['bin/desktopcouch-pair'],32 scripts=['bin/desktopcouch-pair'],
33 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',33 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
34 'bin/desktopcouch-stop']),34 'bin/desktopcouch-stop']),
35 # Be sure all additions are reflected in MANIFEST.in !
35 ('/usr/share/doc/python-desktopcouch-records/api/',36 ('/usr/share/doc/python-desktopcouch-records/api/',
36 ['desktopcouch/records/doc/records.txt']),37 ['desktopcouch/records/doc/records.txt',
37 # System-level XDG_CONFIG_DIRS folder38 'desktopcouch/records/doc/field_registry.txt',
39 'desktopcouch/contacts/schema.txt']),
38 ('/etc/xdg/desktop-couch/',40 ('/etc/xdg/desktop-couch/',
39 ['config/desktop-couch/compulsory-auth.ini']),41 ['config/desktop-couch/compulsory-auth.ini']),
40 ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),42 ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),
41 ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']),43 ('/usr/share/dbus-1/services/', ['org.desktopcouch.CouchDB.service']),
42 ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],44 ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],

Subscribers

People subscribed via source and target branches