r20704 - in /packages/unstable/zeitgeist/debian: control control.in

[rainct-guest at users.alioth.debian.org]

Author: rainct-guest
Date: Tue Jul 14 22:39:51 2009
New Revision: 20704

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20704
Log:
control.in: fix typo in description and add python-pysqlite2 to conflicts (until Zeitgeist gets ride of Storm).

Modified:
    packages/unstable/zeitgeist/debian/control
    packages/unstable/zeitgeist/debian/control.in

Modified: packages/unstable/zeitgeist/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/zeitgeist/debian/control?rev=20704&op=diff
==============================================================================
--- packages/unstable/zeitgeist/debian/control (original)
+++ packages/unstable/zeitgeist/debian/control Tue Jul 14 22:39:51 2009
@@ -21,8 +21,9 @@
  python-storm
 Recommends: python-gtk2 (>= 2.15.1-0ubuntu2)
 Suggests: gnome-zeitgeist
+Conflicts: python-pysqlite2
 Description: activity logging service
- Zeitgeist is a service which logs the users's activities and events (files
+ Zeitgeist is a service which logs the user's activities and events (files
  opened, websites visites, conversations hold with other people, etc.) and
  makes the relevant information available to other applications.
  .

Modified: packages/unstable/zeitgeist/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/zeitgeist/debian/control.in?rev=20704&op=diff
==============================================================================
--- packages/unstable/zeitgeist/debian/control.in (original)
+++ packages/unstable/zeitgeist/debian/control.in Tue Jul 14 22:39:51 2009
@@ -21,8 +21,9 @@
  python-storm
 Recommends: python-gtk2 (>= 2.15.1-0ubuntu2)
 Suggests: gnome-zeitgeist
+Conflicts: python-pysqlite2
 Description: activity logging service
- Zeitgeist is a service which logs the users's activities and events (files
+ Zeitgeist is a service which logs the user's activities and events (files
  opened, websites visites, conversations hold with other people, etc.) and
  makes the relevant information available to other applications.
  .