desktopcouch

Merge lp:~thisfred/desktopcouch/lp-791927 into lp:desktopcouch

  1. lp-791927
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: dobey
Approved revision: 278
Merged at revision: 276
Proposed branch: lp:~thisfred/desktopcouch/lp-791927
Merge into: lp:desktopcouch
Diff against target: 48 lines (+9/-6)
1 file modified
setup.py (+9/-6)
To merge this branch: bzr merge lp:~thisfred/desktopcouch/lp-791927
Reviewer Review Type Date Requested Status
dobey (community) Approve
Tim Cole (community) Approve
Review via email: mp+63271@code.launchpad.net

Commit message

* Install the existing apport hook (LP: #791927)
* Fix setup.py so it uses paths relative to the prefix

Description of the change

* Install the existing apport hook (LP: #791927)
* Fix setup.py so it uses paths relative to the prefix

To post a comment you must log in.
lp:~thisfred/desktopcouch/lp-791927 updated
278. By Eric Casteleijn

updated copyright

Revision history for this message
Tim Cole (tcole) :
review: Approve
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2011-04-08 20:33:44 +0000
3+++ setup.py 2011-06-02 18:12:33 +0000
4@@ -1,6 +1,6 @@
5 #!/usr/bin/env python
6 #
7-# Copyright 2009-2010 Canonical Ltd.
8+# Copyright 2009-2011 Canonical Ltd.
9 #
10 # This file is part of desktopcouch.
11 #
12@@ -17,8 +17,9 @@
13 # along with desktopcouch. If not, see <http://www.gnu.org/licenses/>.
14 """setup.py"""
15
16-from setuptools import setup, find_packages
17+from setuptools import find_packages
18 from DistUtilsExtra.command import build_extra, build_i18n
19+from DistUtilsExtra.auto import setup
20
21 setup(
22 name='desktopcouch',
23@@ -30,19 +31,21 @@
24 author_email='stuart.langridge@canonical.com',
25 packages=find_packages(),
26 scripts=['bin/desktopcouch-pair'],
27- data_files=[('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
28+ data_files=[('lib/desktopcouch/', ['bin/desktopcouch-service',
29 'bin/desktopcouch-pair',
30 'bin/desktopcouch-get-port',
31 'bin/desktopcouch-stop']),
32 # Be sure all additions are reflected in MANIFEST.in !
33- ('/usr/share/doc/python-desktopcouch-records/api/',
34+ ('share/doc/python-desktopcouch-records/api/',
35 ['desktopcouch/records/doc/records.txt',
36 'desktopcouch/records/doc/field_registry.txt',
37 'desktopcouch/recordtypes/contacts/schema.txt']),
38 ('/etc/xdg/desktop-couch/',
39 ['config/desktop-couch/compulsory-auth.ini']),
40- ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),
41- ('/usr/share/dbus-1/services/', [
42+ ('share/desktopcouch/', ['data/couchdb.tmpl']),
43+ ('share/apport/package-hooks/', [
44+ 'data/source_desktopcouch.py']),
45+ ('share/dbus-1/services/', [
46 'org.desktopcouch.CouchDB.service']),
47 ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],
48 cmdclass={"build": build_extra.build_extra,

Subscribers

People subscribed via source and target branches