Merge lp:~paulbrianstewart/ubuntu/oneiric/conduit/840709-Spelling-Grammar-Errors-Fix into lp:ubuntu/oneiric/conduit

[Paul Stewart]

* Changed the formatting marks from "*" to "-", to stop the first 3 characters of the word "Conduit" being truncated
* Added commas to the end of each point
* Changed the first letter of each word on the listed items to lowercase.
* Changed "syncronization" to "synchronization"

I tried to reformat the second paragraph so the formatting doesn't truncate the first 3 characters of the word "Conduit" in the second paragraph.
I also corrected the spelling of the word synchronization" and changed the case of the first letters in the bulleted list to lowercase.

[Didier Roche-Tolomelli (didrocks)]

thanks for this patch and help to make ubuntu better.

and thanks for fixing those small bugs :)
- Can you please forward it to debian so that this fix will benefit to more users?
- also, you need to comment your change in debian/changelog (run dch -i and put your comments there).

Will keep the branch on hold meanwhile those two changes are done.

review: Needs Fixing

[Paul Stewart (paulbrianstewart)]

> thanks for this patch and help to make ubuntu better.
>
> and thanks for fixing those small bugs :)
> - Can you please forward it to debian so that this fix will benefit to more
> users?
> - also, you need to comment your change in debian/changelog (run dch -i and
> put your comments there).
>
> Will keep the branch on hold meanwhile those two changes are done.

Hi Didier,

Thanks. I'll try to do that. I'll get back to you if I have any problems.

Thanks
Paul Stewart

[Paul Stewart (paulbrianstewart)]

> thanks for this patch and help to make ubuntu better.
>
> and thanks for fixing those small bugs :)
> - Can you please forward it to debian so that this fix will benefit to more
> users?
> - also, you need to comment your change in debian/changelog (run dch -i and
> put your comments there).
>
> Will keep the branch on hold meanwhile those two changes are done.

Hi Didier,

I just had a look at the __init__.py file in the lp:conduit code and the errors that I found in the ubuntu version of the control file do not exist in the code that I downloaded from lp:conduit . In that case I don't think there is a need to submit it to debian as the problem doesn't appear to exist.

Thanks
Paul Stewart

[Didier Roche-Tolomelli (didrocks)]

Hey Paul, weren't your changes in debian/control (see the diff below) and not in __init__.py, or am I missing something really obvious? (which is more than possible :))

[Paul Stewart (paulbrianstewart)]

> Hey Paul, weren't your changes in debian/control (see the diff below) and not
> in __init__.py, or am I missing something really obvious? (which is more than
> possible :))

Hi Didier,

No, it's more likely I'm an idiot :) . I downloaded the conduit code using "bzr branch lp:conduit" thinking that this was the debian version of the code. I'll do what you asked above.

I've been on holiday for the last week so I'm just starting to wake up again. I'll get onto this tonight.

Thanks
Paul

[Paul Stewart (paulbrianstewart)]

Hi Didier,

I have submitted the changes to Debian and documented the changes in the debian/changelog as requested.

Please let me know if you need me to do anything else.

Thanks
Paul Stewart

review: Needs Resubmitting

[Didier Roche-Tolomelli (didrocks)]

Hey Paul, thanks a lot for your work there! As told previously, it's a little bit late for Oneiric though. Meanwhile, you would mind tracking that your change has to integrated to debian so that it's just a sync?
Please, when P… is out, do not hesitate to ping back there if it's not the case, I'll integrate it here if it's not in debian already.

Thanks again for pushing that :)

[Paul Stewart (paulbrianstewart)]

> Hey Paul, thanks a lot for your work there! As told previously, it's a little
> bit late for Oneiric though. Meanwhile, you would mind tracking that your
> change has to integrated to debian so that it's just a sync?
> Please, when P… is out, do not hesitate to ping back there if it's not the
> case, I'll integrate it here if it's not in debian already.
>
> Thanks again for pushing that

Hi Didier,

Sorry to be such a dumbass, but I'm not sure what you mean in your question "Meanwhile, you would mind tracking that your change has to integrated to debian so that it's just a sync?". What do I need to do exactly to do that?
Do you mean you want me to check that the change is there when the next release of ubuntu (P...) is released?

Thanks, and sorry for all the dumb questions, I'm still getting the hang of submitting bugs etc.
Paul Stewart.

[Didier Roche-Tolomelli (didrocks)]

No worry Paul, sory I didn't notice your lalst comment before :)

What I'm asking you to do is to report the bug back to debian first, it's not the kind of diff which we want to carry specifically in ubuntu as it can benefit all debian users as well. I guess this link will give you what you need to know how to report it to debian, do not hesitate to ask if things are unclear:
https://wiki.ubuntu.com/Debian/ForUbuntuDevelopers#Forwarding_bug_reports

[Paul Stewart (paulbrianstewart)]

Ok, thanks Didier,

I will do that in the future...apologies for making extra work for you.

Thanks
Paul

On 10/11/2011 04:42 AM, Didier Roche wrote:
> No worry Paul, sory I didn't notice your lalst comment before :)
>
> What I'm asking you to do is to report the bug back to debian first, it's not the kind of diff which we want to carry specifically in ubuntu as it can benefit all debian users as well. I guess this link will give you what you need to know how to report it to debian, do not hesitate to ask if things are unclear:
> https://wiki.ubuntu.com/Debian/ForUbuntuDevelopers#Forwarding_bug_reports

Unmerged revisions

17. By Paul Stewart on 2011-09-04

* Changed "syncronization" to "synchronization"

16. By Paul Stewart on 2011-09-04

* Changed the formatting marks from "*" to "-", to stop the first 3 characters of the word "Conduit" being truncated
* Added commas to the end of each point
* Changed the first letter of each word on the listed items to lowercase.

=== modified file 'debian/control'
--- debian/control	2010-03-30 23:47:33 +0000
+++ debian/control	2011-09-04 01:04:23 +0000
@@ -45,14 +45,14 @@
             python (>= 2.6) | python-json
 Provides: ${python:Provides}
 Description: synchronization tool for GNOME
- A syncronization tool for GNOME which allows the user to take their
+ A synchronization tool for GNOME which allows the user to take their
  emails, files, bookmarks, and any other type of personal information
  and synchronize that data with another computer, an online service, or
- even another electronic device.
+ another electronic device.
  .
- Conduit manages the synchronization and conversion of data into other
- formats. For example, conduit allows you to;
-  * Synchronize your tomboy notes to a file on a remote computer
-  * Synchronize your emails to your mobile phone
-  * Synchronize your bookmarks to delicious, gmail, or even your own webserver
-  * and many more..
+  Conduit manages the synchronization and conversion of data into other
+  formats. For example, conduit allows you to
+   - synchronize your tomboy notes to a file on a remote computer,
+   - synchronize your emails to your mobile phone,
+   - synchronize your bookmarks to delicious, gmail, or even your own web server,
+   - and much more.