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

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

Author: rainct-guest
Date: Tue Jul 14 23:31:00 2009
New Revision: 20706

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20706
Log:
Removed Conflicts again, 0.2 will have a workaround.

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=20706&op=diff
==============================================================================
--- packages/unstable/zeitgeist/debian/control (original)
+++ packages/unstable/zeitgeist/debian/control Tue Jul 14 23:31:00 2009
@@ -21,7 +21,6 @@
  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 user's activities and events (files
  opened, websites visited, conversations hold with other people, etc.) and

Modified: packages/unstable/zeitgeist/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/zeitgeist/debian/control.in?rev=20706&op=diff
==============================================================================
--- packages/unstable/zeitgeist/debian/control.in (original)
+++ packages/unstable/zeitgeist/debian/control.in Tue Jul 14 23:31:00 2009
@@ -21,7 +21,6 @@
  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 user's activities and events (files
  opened, websites visited, conversations hold with other people, etc.) and