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

[James Tatum]

[James Tatum (jtatum)]

Removing patch from packaging recipe - adding it in Debian branch

[Javier Collado (javier.collado)]

 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

=== modified file 'mago.recipe'
--- mago.recipe	2009-09-10 08:54:45 +0000
+++ mago.recipe	2009-09-10 21:43:12 +0000
@@ -1,4 +1,3 @@
 # bzr-builder format 0.2 deb-version 0.2-0ubuntu1~rev{revno}
 lp:mago
 nest debian lp:~mago-contributors/mago/debian debian
-run patch setup.py < ../../setup.py.patch
 
=== removed file 'setup.py.patch'
--- setup.py.patch	2009-09-09 06:51:41 +0000
+++ setup.py.patch	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
---- setup.py	2009-09-09 08:44:18.000000000 +0200
-+++ setup.py.new	2009-09-09 08:44:12.000000000 +0200
-@@ -86,6 +86,26 @@
-                 'TESTS_SHARE = "/usr/share/mago"'})
- 
- 
-+def rlist(prefix, dirs):
-+    """
-+    Recursively list files to be installed and installation prefix to
-+    path
-+    """
-+    files = []
-+
-+    def add_files(acc, dirname, fnames):
-+        fnames = [os.path.join(dirname, fname)
-+                  for fname in fnames]
-+        fnames = [fname for fname in fnames
-+                  if os.path.isfile(fname)]
-+        acc.append((os.path.join(prefix, dirname),
-+                    fnames))
-+
-+    for dir in dirs:
-+        os.path.walk(dir, add_files, files)
-+    return files
-+
-+
- setup(
-     name = "mago",
-     version = changelog_version(),
-@@ -97,7 +117,11 @@
- This project provides a library and scripts for mago.
- """,
-     data_files = [
--        ("share/mago", ["report.xsl", "conffile.ini"])],
-+        ("share/mago", ["report.xsl", "conffile.ini"])] \
-+        + rlist("share/mago-test",
-+                ["evolution", "gedit", "gnome-screenshot",
-+                 "indicator-applet", "notify-osd", "pidgin",
-+                 "seahorse", "ubuntu-menu", "update-manager"]),
-     scripts = ["bin/mago"],
-     packages = ["mago",
-                 "mago.application",