Merge lp:~jtatum/mago/debian-patch into lp:~mago-contributors/mago/debian

[James Tatum]

[James Tatum (jtatum)]

Removing patch from packaging recipe - adding it in Debian branch

[Javier Collado (javier.collado)]

 review approve

Nice suggestion! I didn't know about quilt. Thanks.

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

review: Approve

=== added file 'README.source'
--- README.source	1970-01-01 00:00:00 +0000
+++ README.source	2009-09-10 21:28:49 +0000
@@ -0,0 +1,1 @@
+This package uses quilt, as documented in /usr/share/doc/quilt/README.source
 
=== modified file 'control'
--- control	2009-09-09 09:58:53 +0000
+++ control	2009-09-10 21:39:27 +0000
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: Javier Collado <[e-mail]>
-Build-Depends: cdbs (>= 0.4.52), debhelper (>= 7.0.17), python-central (>= 0.6.11), python-distutils-extra
+Build-Depends: cdbs (>= 0.4.52), debhelper (>= 7.0.17), python-central (>= 0.6.11), python-distutils-extra, quilt
 Standards-Version: 3.8.2
 XS-Python-Version: >= 2.6
 Homepage: http://mago.ubuntu.com/
 
=== added directory 'patches'
=== added file 'patches/series'
--- patches/series	1970-01-01 00:00:00 +0000
+++ patches/series	2009-09-10 21:28:49 +0000
@@ -0,0 +1,1 @@
+setup_py_add_tests.patch
 
=== added file 'patches/setup_py_add_tests.patch'
--- patches/setup_py_add_tests.patch	1970-01-01 00:00:00 +0000
+++ patches/setup_py_add_tests.patch	2009-09-10 21:28:49 +0000
@@ -0,0 +1,42 @@
+--- a/setup.py
++++ b/setup.py
+@@ -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",
 
=== modified file 'rules'
--- rules	2009-09-09 09:23:40 +0000
+++ rules	2009-09-10 21:39:27 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 DEB_PYTHON_SYSTEM=pycentral
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk