Merge lp:~jtatum/mago/packaging-recipe-patch into lp:~mago-contributors/mago/packaging-recipe

Proposed by James Tatum
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jtatum/mago/packaging-recipe-patch
Merge into: lp:~mago-contributors/mago/packaging-recipe
Diff against target: None lines
To merge this branch: bzr merge lp:~jtatum/mago/packaging-recipe-patch
Reviewer Review Type Date Requested Status
Javier Collado (community) Approve
Review via email: mp+11577@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Tatum (jtatum) wrote :

Removing patch from packaging recipe - adding it in Debian branch

Revision history for this message
Javier Collado (javier.collado) wrote :

 review approve

James Tatum wrote:
> James Tatum has proposed merging lp:~jtatum/mago/packaging-recipe-patch into lp:~mago-contributors/mago/packaging-recipe.
>
> Requested reviews:
> Javier Collado (javier.collado)
>
> Removing patch from packaging recipe - adding it in Debian branch
>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mago.recipe'
2--- mago.recipe 2009-09-10 08:54:45 +0000
3+++ mago.recipe 2009-09-10 21:43:12 +0000
4@@ -1,4 +1,3 @@
5 # bzr-builder format 0.2 deb-version 0.2-0ubuntu1~rev{revno}
6 lp:mago
7 nest debian lp:~mago-contributors/mago/debian debian
8-run patch setup.py < ../../setup.py.patch
9
10=== removed file 'setup.py.patch'
11--- setup.py.patch 2009-09-09 06:51:41 +0000
12+++ setup.py.patch 1970-01-01 00:00:00 +0000
13@@ -1,42 +0,0 @@
14---- setup.py 2009-09-09 08:44:18.000000000 +0200
15-+++ setup.py.new 2009-09-09 08:44:12.000000000 +0200
16-@@ -86,6 +86,26 @@
17- 'TESTS_SHARE = "/usr/share/mago"'})
18-
19-
20-+def rlist(prefix, dirs):
21-+ """
22-+ Recursively list files to be installed and installation prefix to
23-+ path
24-+ """
25-+ files = []
26-+
27-+ def add_files(acc, dirname, fnames):
28-+ fnames = [os.path.join(dirname, fname)
29-+ for fname in fnames]
30-+ fnames = [fname for fname in fnames
31-+ if os.path.isfile(fname)]
32-+ acc.append((os.path.join(prefix, dirname),
33-+ fnames))
34-+
35-+ for dir in dirs:
36-+ os.path.walk(dir, add_files, files)
37-+ return files
38-+
39-+
40- setup(
41- name = "mago",
42- version = changelog_version(),
43-@@ -97,7 +117,11 @@
44- This project provides a library and scripts for mago.
45- """,
46- data_files = [
47-- ("share/mago", ["report.xsl", "conffile.ini"])],
48-+ ("share/mago", ["report.xsl", "conffile.ini"])] \
49-+ + rlist("share/mago-test",
50-+ ["evolution", "gedit", "gnome-screenshot",
51-+ "indicator-applet", "notify-osd", "pidgin",
52-+ "seahorse", "ubuntu-menu", "update-manager"]),
53- scripts = ["bin/mago"],
54- packages = ["mago",
55- "mago.application",

Subscribers

People subscribed via source and target branches

to all changes: