Merge lp:~zeitgeist-dataproviders/zeitgeist-datasources/remove-totem-gedit-rb-packaging into lp:~zeitgeist-dataproviders/zeitgeist-datasources/debian

Status: Rejected
Rejected by: Manish Sinha (मनीष सिन्हा)
Proposed branch: lp:~zeitgeist-dataproviders/zeitgeist-datasources/remove-totem-gedit-rb-packaging
Merge into: lp:~zeitgeist-dataproviders/zeitgeist-datasources/debian
Diff against target: 171 lines (+76/-52)
5 files modified
debian/changelog (+37/-4)
debian/control (+39/-45)
debian/zeitgeist-datasource-gedit.install (+0/-1)
debian/zeitgeist-datasource-rhythmbox.install (+0/-1)
debian/zeitgeist-datasource-totem.install (+0/-1)
To merge this branch: bzr merge lp:~zeitgeist-dataproviders/zeitgeist-datasources/remove-totem-gedit-rb-packaging
Reviewer Review Type Date Requested Status
Markus Korn Pending
Siegfried Gevatter Pending
Review via email: mp+60179@code.launchpad.net

Description of the change

Add section for tomboy and xchat

Remove 3 packages because they have been merged upstream
* RB
* gedit
* totem

Just FYI this branch was not updated since long. I took the debian/ directory from the packages present in our PPA and merged it here.
The first commit is for that.

To post a comment you must log in.
Revision history for this message
Siegfried Gevatter (rainct) wrote :

I don't think the Rhythmbox, Gedit and Totem plugins are in Debian yet. I'd be cool to still have them in the 0.8 tarball.

Unmerged revisions

98. By Manish Sinha (मनीष सिन्हा)

Remove Totem as it has been upstreamed

97. By Manish Sinha (मनीष सिन्हा)

Removed RB as it has been upstreamed

96. By Manish Sinha (मनीष सिन्हा)

Removed gedit extension. It has been upstreamed

95. By Manish Sinha (मनीष सिन्हा)

* Bug fixes
 - Fix Firefox incognito mode
 - Fix local install of Firefox DP
 - Tomboy dataprovider now registers itself in DataSourceRegistry
 - Add leave event in XChat when application exits
 - Vim plugin fails gracefully when there is no session bus
 - Chromium Fixes
* Added xchat dataprovider.
* Added tomboy dataprovider.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-07 14:11:29 +0000
3+++ debian/changelog 2011-05-06 13:03:29 +0000
4@@ -1,6 +1,39 @@
5-zeitgeist-datasources (0.1.0~bzr20110307-1) unstable; urgency=low
6-
7- * Initial packaging (Closes: #617247).
8+zeitgeist-datasources (0.1.0+bzr20100127-0ubuntu1~maverick1~ppa2) maverick; urgency=low
9+
10+ * Bug fixes
11+ - Fix Firefox incognito mode
12+ - Fix local install of Firefox DP
13+ - Tomboy dataprovider now registers itself in DataSourceRegistry
14+ - Add leave event in XChat when application exits
15+ - Vim plugin fails gracefully when there is no session bus
16+ - Chromium Fixes
17+
18+ -- Manish Sinha <manishsinha@ubuntu.com> Thurs, 28 Jan 2010 00:58:41 +0530
19+
20+
21+zeitgeist-datasources (0.1.0-0~manish6-maverick) maverick; urgency=low
22+
23+ * Added xchat dataprovider.
24+
25+ -- Manish Sinha <manishsinha@ubuntu.com> Wed, 12 Jan 2010 01:06:41 +0530
26+
27+
28+zeitgeist-datasources (0.1.0-0~manish5-maverick) maverick; urgency=low
29+
30+ * Added tomboy dataprovider.
31+
32+ -- Manish Sinha <mail@manishsinha.net> Mon, 22 Nov 2010 22:23:41 +0530
33+
34+
35+zeitgeist-datasources (0.1.0~bzr20101102+93-93+201011031152) maverick; urgency=low
36+
37+ * Auto build.
38+
39+ -- Markus Korn <thekorn@gmx.de> Wed, 03 Nov 2010 12:52:41 +0100
40+
41+zeitgeist-datasources (0.1.0~bzr20101102-0~ppa1) experimental; urgency=low
42+
43+ * Initial packaging.
44 Thanks to Frederic Brin for the initial work on this package.
45
46- -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Mon, 07 Mar 2011 15:11:25 +0100
47+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sat, 30 Oct 2010 13:58:47 +0200
48
49=== modified file 'debian/control'
50--- debian/control 2010-11-03 10:43:13 +0000
51+++ debian/control 2011-05-06 13:03:29 +0000
52@@ -9,7 +9,15 @@
53 xulrunner-dev,
54 libtotem-plparser-dev,
55 geany,
56- emacs
57+ emacs,
58+ libzeitgeist0.1-cil,
59+ libzeitgeist-cil-dev,
60+ libgtk2.0-cil-dev,
61+ cli-common-dev (>= 0.5.7),
62+ mono-devel (>= 2.4.3),
63+ mono-xbuild,
64+ tomboy,
65+ xchat
66 Standards-Version: 3.9.1
67 Homepage: http://launchpad.net/zeitgeist-dataproviders
68 Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~zeitgeist-dataproviders/zeitgeist-dataproviders/debian
69@@ -106,50 +114,6 @@
70 This package contains a plugin for Geany that will notify Zeitgeist
71 of meaningful events.
72
73-Package: zeitgeist-datasource-gedit
74-Architecture: all
75-Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, gedit
76-Enhances: zeitgeist-core, gedit
77-Description: Zeitgeist Dataprovider for gedit
78- Zeitgeist is a service which logs the user's activities and events (files
79- opened, websites visited, conversations hold with other people, etc.) and
80- makes the relevant information available to other applications.
81- .
82- It serves as a comprehensive activity log and also makes it possible to
83- determine relationships between items based on usage patterns.
84- .
85- This package contains a plugin for gedit will notify Zeitgeist
86- of meaningful events.
87-
88-Package: zeitgeist-datasource-rhythmbox
89-Architecture: all
90-Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, rhythmbox
91-Enhances: zeitgeist-core, rhythmbox
92-Description: Zeitgeist Dataprovider for Rhythmbox
93- Zeitgeist is a service which logs the user's activities and events (files
94- opened, websites visited, conversations hold with other people, etc.) and
95- makes the relevant information available to other applications.
96- .
97- It serves as a comprehensive activity log and also makes it possible to
98- determine relationships between items based on usage patterns.
99- .
100- This package contains a plugin for Rhythmbox that will notify Zeitgeist
101- of meaningful events.
102-
103-Package: zeitgeist-datasource-totem
104-Architecture: any
105-Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, totem
106-Enhances: zeitgeist-core, totem
107-Description: Zeitgeist Dataprovider for Totem
108- Zeitgeist is a service which logs the user's activities and events (files
109- opened, websites visited, conversations hold with other people, etc.) and
110- makes the relevant information available to other applications.
111- .
112- It serves as a comprehensive activity log and also makes it possible to
113- determine relationships between items based on usage patterns.
114- .
115- This package contains a plugin for Totem that will notify Zeitgeist
116- of meaningful events.
117
118 Package: zeitgeist-datasource-vim
119 Architecture: any
120@@ -165,3 +129,33 @@
121 .
122 This package contains a plugin for Vim that will notify Zeitgeist
123 of meaningful events.
124+
125+Package: zeitgeist-datasource-tomboy
126+Architecture: all
127+Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, tomboy, libzeitgeist0.1-cil
128+Enhances: zeitgeist-core, tomboy
129+Description: Zeitgeist Dataprovider for Tomboy
130+ Zeitgeist is a service which logs the user's activities and events (files
131+ opened, websites visited, conversations hold with other people, etc.) and
132+ makes the relevant information available to other applications.
133+ .
134+ It serves as a comprehensive activity log and also makes it possible to
135+ determine relationships between items based on usage patterns.
136+ .
137+ This package contains a addin for Tomboy that will notify Zeitgeist
138+ of meaningful events.
139+
140+Package: zeitgeist-datasource-xchat
141+Architecture: any
142+Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, xchat, libzeitgeist-1.0-0
143+Enhances: zeitgeist-core, xchat
144+Description: Zeitgeist Dataprovider for XChat
145+ Zeitgeist is a service which logs the user's activities and events (files
146+ opened, websites visited, conversations hold with other people, etc.) and
147+ makes the relevant information available to other applications.
148+ .
149+ It serves as a comprehensive activity log and also makes it possible to
150+ determine relationships between items based on usage patterns.
151+ .
152+ This package contains a extension for XChat that will notify Zeitgeist
153+ of meaningful events.
154
155=== removed file 'debian/zeitgeist-datasource-gedit.install'
156--- debian/zeitgeist-datasource-gedit.install 2010-11-02 22:58:46 +0000
157+++ debian/zeitgeist-datasource-gedit.install 1970-01-01 00:00:00 +0000
158@@ -1,1 +0,0 @@
159-usr/lib/gedit-2
160
161=== removed file 'debian/zeitgeist-datasource-rhythmbox.install'
162--- debian/zeitgeist-datasource-rhythmbox.install 2010-11-02 22:58:46 +0000
163+++ debian/zeitgeist-datasource-rhythmbox.install 1970-01-01 00:00:00 +0000
164@@ -1,1 +0,0 @@
165-usr/lib/rhythmbox/plugins/zeitgeist-plugin
166
167=== removed file 'debian/zeitgeist-datasource-totem.install'
168--- debian/zeitgeist-datasource-totem.install 2010-11-02 22:58:46 +0000
169+++ debian/zeitgeist-datasource-totem.install 1970-01-01 00:00:00 +0000
170@@ -1,1 +0,0 @@
171-usr/lib/totem

Subscribers

People subscribed via source and target branches

to all changes: