Merge lp:~ken-vandine/unity-launcher-editor/setup_fixes into lp:unity-launcher-editor

Proposed by Ken VanDine
Status: Merged
Merged at revision: 62
Proposed branch: lp:~ken-vandine/unity-launcher-editor/setup_fixes
Merge into: lp:unity-launcher-editor
Diff against target: 44 lines (+5/-8)
2 files modified
MANIFEST.in (+1/-1)
setup.py (+4/-7)
To merge this branch: bzr merge lp:~ken-vandine/unity-launcher-editor/setup_fixes
Reviewer Review Type Date Requested Status
Ursula Junque (community) Approve
Review via email: mp+71605@code.launchpad.net

Description of the change

In an attempt to create an ubuntu package for unity-launcher-editor, I had tweak setup.py and MANIFEST.in to make sure everything would get installed properly.

To post a comment you must log in.
Revision history for this message
Ursula Junque (ursinha) wrote :

This is pretty much what I was doing in a very messy branch I have. I'm fine with the changes, if Laudeci is fine, that can be merged.

Cheers, and thanks for doing that!

review: Approve
Revision history for this message
Laudeci Oliveira (laudeci) wrote :

ok, can you merge @Ursula?

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 2011-05-13 13:01:15 +0000
3+++ MANIFEST.in 2011-08-15 20:30:29 +0000
4@@ -1,1 +1,1 @@
5-recursive-include unitylaunchereditor/data *.glade
6+recursive-include unitylaunchereditor/data *.glade *png
7
8=== modified file 'setup.py'
9--- setup.py 2011-05-13 15:17:02 +0000
10+++ setup.py 2011-08-15 20:30:29 +0000
11@@ -1,20 +1,20 @@
12 #!/usr/bin/env python
13
14 try:
15- from setuptools import setup
16+ from setuptools import setup, find_packages
17 except ImportError:
18 # In case the system doesn't have setuptools
19 import distribute_setup
20 distribute_setup.use_setuptools()
21
22- from setuptools import setup
23+ from setuptools import setup, find_packages
24
25
26 __version__ = 0.1
27
28 setup(name='unity-launcher-editor',
29 version=__version__,
30- packages=['unitylaunchereditor'],
31+ packages=find_packages(),
32 install_requires=[
33 'setuptools',
34 'pygtk',
35@@ -22,8 +22,5 @@
36 'pkg_resources',
37 ],
38 include_package_data=True,
39- entry_points=dict(
40- gui_scripts=[
41- 'unity-launcher-editor = unitylaunchereditor.main:main',
42- ]),
43+ scripts=['ule'],
44 )

Subscribers

People subscribed via source and target branches