Merge lp:~ara/mago/mago into lp:~mago-contributors/mago/mago-1.0

[Ara Pulido]

[Ara Pulido (ara)]

These are minor changes to be able to announce the new project name to the mailing list.
This is not related to the changes of dry_run and/or test_discovery.
This is just a quick name fix so we can expose this publicly as soon as possible.

[Ara Pulido (ara)]

I also removed the debian packaging, as we are not using it and it is very outdated.
If we decide to package Mago, we can add it later again.

[Javier Collado (javier.collado)]

Hello,

desktoptesting package should be renamed to mago also, right?

Best regards,
    Javier

review: Needs Information

[Ara Pulido (ara)]

I was not sure about that point.
Before, the project name was ubuntu-desktop-testing and the library desktoptesting.

I wouldn't like people to think that the project is just the library.

would libmago a better name?

[Javier Collado (javier.collado)]

I would stick to mago just to have a short name. I think there are many projects whose name mean multiple things and that's not a problem.

Best regards,
    Javier

> I was not sure about that point.
> Before, the project name was ubuntu-desktop-testing and the library
> desktoptesting.
>
> I wouldn't like people to think that the project is just the library.
>
> would libmago a better name?

[Nagappan Alagappan (nagappan)]

> would libmago a better name?

What mago stands for ? I like libmago though :)

Thanks

[Ara Pulido (ara)]

> I would stick to mago just to have a short name. I think there are many
> projects whose name mean multiple things and that's not a problem.
>

I think libmago is short enough and it would be better for packaging in the future. If we create a package in the future, mago could be the source package providing as binaries: mago and libmago (and maybe magotests)

[lp:~ara/mago/mago]

57. By Ara Pulido on 2009-06-10

Changed the package name to mago

[Ara Pulido (ara)]

Package name changed.

Regards,
Ara.

> Hello,
>
> desktoptesting package should be renamed to mago also, right?
>
> Best regards,
> Javier

[Ara Pulido (ara)]

Is there anything else needed? I would like to have this small change approved ASAP, so I can announce the new name at the list.

Thanks,
Ara.

[Javier Collado (javier.collado)]

After the package name change, I don't have any other concern.

review: Approve

=== renamed file 'bin/ubuntu-desktop-test' => 'bin/mago'
--- bin/ubuntu-desktop-test	2009-06-03 14:40:26 +0000
+++ bin/mago	2009-06-09 15:22:50 +0000
@@ -22,7 +22,7 @@
 
 # Globals
 TESTS_SHARE = "."
-TESTS_HOME  = os.environ["HOME"] + "/.ubuntu-desktop-test"
+TESTS_HOME  = os.environ["HOME"] + "/.mago"
 SCREENSHOTS_SHARE = "/tmp/ldtp-screenshots"
 
 # For the moment, all applications should be running in English
@@ -224,7 +224,7 @@
     usage = "%prog [OPTIONS]"
     parser = OptionParser(usage=usage)
 
-    default_target = "~/.ubuntu-desktop-test"
+    default_target = "~/.mago"
     default_log_level = "critical"
 
     parser.add_option("-l", "--log",

=== removed directory 'debian'
=== removed file 'debian/changelog'
--- debian/changelog	2009-03-10 01:49:07 +0000
+++ debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-ubuntu-desktop-testing (0.1-0ubuntu2) jaunty; urgency=low
-
-  * Various fixes for Checkbox integration
-  * Fixed packaging for Jaunty/Python 2.6
-
- -- Dave Murphy <[e-mail]>  Tue, 10 Mar 2009 01:47:13 +0000
-
-ubuntu-desktop-testing (0.1-0ubuntu1) intrepid; urgency=low
-
-  * Initial release.
-
- -- Ara Pulido <[e-mail]>  Thu, 31 Jul 2008 07:16:11 -0400

=== removed file 'debian/compat'
--- debian/compat	2008-08-21 11:18:49 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-5

=== removed file 'debian/control'
--- debian/control	2008-08-27 11:33:17 +0000
+++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Source: ubuntu-desktop-testing
-Section: utils
-Priority: optional
-XSBC-Original-Maintainer: Ara Pulido <[e-mail]>
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
-Standards-Version: 3.8.0
-XS-Python-Version: current
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-central, python-dev (>= 2.4), python-distutils-extra
-Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
-
-Package: ubuntu-desktop-tests
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ldtp, python-ldtp, desktop-testing-library
-Recommends: xsltproc, firefox
-XB-Python-Version: ${python:Versions}
-Description: Ubuntu Desktop Tests
- A set of desktop tests that can be used with the desktop-testing-library to test Ubuntu automatically.
-Vcs-Bzr: https://code.launchpad.net/~apulido/ubuntu-desktop-testing/ubuntu-desktop-testing
-
-Package: desktop-testing-library
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ldtp, python-ldtp
-XB-Python-Version: ${python:Versions}
-Description: Desktop Testing library
- Library for desktop testing. It allows the user to write desktop tests for Ubuntu withouth needing to know how LDTP framework works internally. 
-Vcs-Bzr: https://code.launchpad.net/~apulido/ubuntu-desktop-testing/ubuntu-desktop-testing

=== removed file 'debian/copyright'
--- debian/copyright	2008-08-27 11:33:17 +0000
+++ debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-This package was debianized by Ara Pulido <[e-mail]>
-Thu Jul 31 07:41:17 EDT 2008
-
-It was downloaded from http://launchpad.net/ubuntu-tests
-
-Upstream Authors:
-    Ara Pulido <[e-mail]>
-
-Copyright:
-    Copyright (c) 2008 Canonical
-
-License:
-
-    This package is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-The entire code base may be distributed under the terms of the GNU Lesser General Public License (LGPL).

=== removed file 'debian/desktop-testing-library.install'
--- debian/desktop-testing-library.install	2009-03-10 01:49:07 +0000
+++ debian/desktop-testing-library.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/python*/dist-packages/desktoptesting/*

=== removed file 'debian/pycompat'
--- debian/pycompat	2008-08-21 11:18:49 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file 'debian/rules'
--- debian/rules	2009-03-10 01:49:07 +0000
+++ debian/rules	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM := pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile --install-layout=deb
-
-clean::
-	-find . -name \*.mo -exec rm {} \;

=== removed file 'debian/ubuntu-desktop-tests.install'
--- debian/ubuntu-desktop-tests.install	2008-10-20 23:27:39 +0000
+++ debian/ubuntu-desktop-tests.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/bin/ubuntu-desktop-test
-usr/share/ubuntu-desktop-tests/*

=== modified file 'report.xsl'
--- report.xsl	2009-03-30 14:49:24 +0000
+++ report.xsl	2009-06-09 15:22:50 +0000
@@ -4,7 +4,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
       <head>
         <title>
-    Ubuntu LDTP Tests Report
+    Mago Tests Report
     </title>
         <!-- Launchpad style sheet -->
         <style type="text/css" media="screen, print">@import url(https://edge.launchpad.net/+icing/rev7667/+style-slimmer.css);</style>
@@ -93,10 +93,10 @@
               <p>
                 <br/>
               </p>
-              <h1>Ubuntu LDTP Tests Report</h1>
+              <h1>Mago Tests Report</h1>
               <p>
-                  This are the results from a run of Ubuntu Desktop Tests. <br/>
-                  If you find false positives, please, report bugs against <a href="https://launchpad.net/ubuntu-desktop-testing/+filebug">ubuntu-desktop-testing</a> project.
+                  This are the results from a run of Mago Desktop Tests. <br/>
+                  If you find false positives, please, report bugs against <a href="https://launchpad.net/mago/+filebug">Mago</a> project.
               </p>
               <h2><b>Suite: <xsl:value-of select="suite/@name" /></b> (Class: <xsl:value-of select="suite/class" />)</h2>
               <h2>Description: <xsl:value-of select="suite/description" /></h2>

=== modified file 'setup.py'
--- setup.py	2009-05-26 15:13:02 +0000
+++ setup.py	2009-06-09 15:22:50 +0000
@@ -83,34 +83,34 @@
             infile = os.path.join("bin", os.path.basename(outfile))
             substitute_variables(infile, outfile, {
                 'TESTS_SHARE = "."':
-                'TESTS_SHARE = "/usr/share/ubuntu-desktop-tests"'})
+                'TESTS_SHARE = "/usr/share/mago"'})
 
 
 setup(
-    name = "ubuntu-desktop-testing",
+    name = "mago",
     version = changelog_version(),
     author = "Ara Pulido",
     author_email = "[e-mail]",
     license = "LGPL",
-    description = "Ubuntu Desktop Testing",
+    description = "Mago",
     long_description = """
 This project provides a library and scripts for desktop testing.
 """,
     data_files = [
-        ("share/ubuntu-desktop-tests", ["report.xsl", "conffile.ini"]),
-        ("share/ubuntu-desktop-tests/gedit", ["gedit/*.*"]),
-        ("share/ubuntu-desktop-tests/gedit/data", ["gedit/data/*"]),
-        ("share/ubuntu-desktop-tests/notify-osd", ["notify-osd/*.*"]),
-        ("share/ubuntu-desktop-tests/notify-osd/data", ["notify-osd/data/*"]),
-        ("share/ubuntu-desktop-tests/indicator-applet", ["indicator-applet/*.*"]),
-        ("share/ubuntu-desktop-tests/indicator-applet/data", ["indicator-applet/data/*"]),
-        ("share/ubuntu-desktop-tests/gnome-panel", ["gnome-panel/*.*"]),
-        ("share/ubuntu-desktop-tests/gnome-panel/data", ["gnome-panel/data/*"]),
-        ("share/ubuntu-desktop-tests/update-manager", ["update-manager/*.*"]),
-        ("share/ubuntu-desktop-tests/update-manager/data", ["update-manager/data/*"]),
-        ("share/ubuntu-desktop-tests/seahorse", ["seahorse/*.*"]),
-        ("share/ubuntu-desktop-tests/seahorse/data", ["seahorse/data/*"])],
-    scripts = ["bin/ubuntu-desktop-test"],
+        ("share/mago", ["report.xsl", "conffile.ini"]),
+        ("share/mago/gedit", ["gedit/*.*"]),
+        ("share/mago/gedit/data", ["gedit/data/*"]),
+        ("share/mago/notify-osd", ["notify-osd/*.*"]),
+        ("share/mago/notify-osd/data", ["notify-osd/data/*"]),
+        ("share/mago/indicator-applet", ["indicator-applet/*.*"]),
+        ("share/mago/indicator-applet/data", ["indicator-applet/data/*"]),
+        ("share/mago/gnome-panel", ["gnome-panel/*.*"]),
+        ("share/mago/gnome-panel/data", ["gnome-panel/data/*"]),
+        ("share/mago/update-manager", ["update-manager/*.*"]),
+        ("share/mago/update-manager/data", ["update-manager/data/*"]),
+        ("share/mago/seahorse", ["seahorse/*.*"]),
+        ("share/mago/seahorse/data", ["seahorse/data/*"])],
+    scripts = ["bin/mago"],
     packages = ["desktoptesting",
                 "desktoptesting.application",
                 "desktoptesting.test_suite"],