Merge lp:~notgary-deactivatedaccount/zim/zim-fix-613303 into lp:~jaap.karssenberg/zim/pyzim

[Chris Wilson]

Rewrote description in debian/control to be more informative.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-02 20:14:14 +0000
+++ debian/changelog	2011-01-16 11:41:22 +0000
@@ -1,3 +1,9 @@
+zim (0.49ubuntu1) natty; urgency=low
+
+  * Rewrote description in debian/control to be more informative (LP:613303)
+
+ -- Chris Wilson <[e-mail]>  Sun, 16 Jan 2011 11:34:25 +0000
+
 zim (0.49) maverick; urgency=low
 
   * Updated to release 0.49 
 
=== modified file 'debian/control'
--- debian/control	2010-11-02 20:14:14 +0000
+++ debian/control	2011-01-16 11:41:22 +0000
@@ -17,12 +17,11 @@
 # dvipng required for the "equation" plugin
 Suggests: bzr, graphviz, scrot, dvipng
 Description: A Desktop Wiki Editor
- Zim brings the concept of a wiki to your desktop. Store
- information, link pages and edit with WYSISYG markup.
- Creating a new page is as easy as linking to a non-existing
- page. Pages are stored in a folder structure, like in an
- outliner, and can have attachments.
- .
- This tool can be used to keep track of TODO lists or ideas,
- to take notes during a meeting or to draft any other kind of
- text (blog entries, important mails, etc.).
+ Zim is a graphical text editor used to maintain a collection of wiki pages. Each page can contain links to other pages, simple formatting and images. Pages are stored in a folder structure, like in an outliner, and can have attachments. Creating a new page is as easy as linking to a nonexistent page. All data is stored in plain text files with wiki formatting. Various plugins provide additional functionality, like a task list manager, an equation editor, a tray icon, and support for version control.
+.
+Zim can be used to:
+  * Keep an archive of notes
+  * Take notes during meetings or lectures
+  * Organize task lists
+  * Draft blog entries and emails
+  * Do brainstorming