Merge lp:~aleksander-m/tracker/tracker.head.aleksander into lp:~tracker-team/tracker/tracker.head
- tracker.head.aleksander
- Merge into tracker.head
Proposed by
Aleksander Morgado
Status: | Merged |
---|---|
Merge reported by: | Chris Coulson |
Merged at revision: | not available |
Proposed branch: | lp:~aleksander-m/tracker/tracker.head.aleksander |
Merge into: | lp:~tracker-team/tracker/tracker.head |
Diff against target: |
739 lines (+190/-107) 9 files modified
debian/changelog (+73/-47) debian/control (+44/-37) debian/control.in (+36/-11) debian/copyright (+22/-3) debian/libtracker-client.install.in (+0/-1) debian/libtracker-sparql-dev.install.in (+5/-0) debian/libtracker-sparql.install.in (+3/-0) debian/rules (+7/-4) debian/tracker.install.in (+0/-4) |
To merge this branch: | bzr merge lp:~aleksander-m/tracker/tracker.head.aleksander |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Coulson | Approve | ||
Review via email: mp+39093@code.launchpad.net |
Commit message
Description of the change
Updated tracker packaging for 0.9.26
To post a comment you must log in.
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 2010-08-06 01:33:32 +0000 |
3 | +++ debian/changelog 2010-10-21 20:41:35 +0000 |
4 | @@ -1,3 +1,29 @@ |
5 | +tracker (0.9.26-0ubuntu0~unstable1) maverick; urgency=low |
6 | + |
7 | + * New upstream release 0.9.26 |
8 | + |
9 | + * New packages added: libtracker-sparql and libtracker-sparql-dev |
10 | + - add libtracker-sparql.install.in |
11 | + - add libtracker-sparql-dev.install.in |
12 | + - update libtracker-client.install.in |
13 | + - update debian/control.in |
14 | + - update debian/rules |
15 | + * Added dependency for libunistring-dev |
16 | + - update debian/control.in |
17 | + * Removed dependency for libpango-dev and valac |
18 | + - update debian/control.in |
19 | + * Bump libdbus-1-dev, libdbus-glib-1-dev and libsqlite3-dev build-deps |
20 | + - update debian/control.in |
21 | + * In tracker-extract package, suggest gzip instead of unzip and remove |
22 | + odt2txt suggestion. |
23 | + - update debian/control.in |
24 | + * Remove files which no longer exist from the tracker package. |
25 | + - update debian/tracker.install.in |
26 | + * Added copyright of new files |
27 | + - update debian/copyright |
28 | + |
29 | + -- Aleksander Morgado <aleksander@gnu.org> Thu, 21 Oct 2010 22:33:18 +0200 |
30 | + |
31 | tracker (0.9.15-0ubuntu0~unstable1) maverick; urgency=low |
32 | |
33 | * New upstream release 0.9.15 |
34 | @@ -23,7 +49,7 @@ |
35 | - update debian/rules |
36 | * Install vapi helper file /usr/share/vala/vapi/tracker-miner-0.9.deps |
37 | - update debian/libtracker-miner-dev.install.in |
38 | - * Add lintian override for tracker-miner-flickr for |
39 | + * Add lintian override for tracker-miner-flickr for |
40 | binary-or-shlib-defines-rpath, as it's linking to a private library |
41 | in /usr/lib/tracker-0.9 |
42 | - add debian/tracker-miner-flickr.lintian-overrides.in |
43 | @@ -35,37 +61,37 @@ |
44 | |
45 | * Rebased on Ubuntu maverick, remaining changes: |
46 | * Add APIVER and SONAME placeholders to various files, and substitute these |
47 | - with the correct value at build-time. Create the versioned files |
48 | + with the correct value at build-time. Create the versioned files |
49 | automatically at build-time |
50 | - rename debian/control => debian/control.in |
51 | - - rename debian/libtracker-client-0.8-0.install => |
52 | + - rename debian/libtracker-client-0.8-0.install => |
53 | debian/libtracker-client.install.in |
54 | - - rename debian/libtracker-client-0.8-dev.install => |
55 | + - rename debian/libtracker-client-0.8-dev.install => |
56 | debian/libtracker-client-dev.install.in |
57 | - - rename debian/libtracker-extract-0.8-0.install => |
58 | + - rename debian/libtracker-extract-0.8-0.install => |
59 | debian/libtracker-extract.install.in |
60 | - - rename debian/libtracker-extract-0.8-0.lintian-overrides => |
61 | + - rename debian/libtracker-extract-0.8-0.lintian-overrides => |
62 | debian/libtracker-extract.lintian-overrides.in |
63 | - - rename debian/libtracker-extract-0.8-dev.install => |
64 | + - rename debian/libtracker-extract-0.8-dev.install => |
65 | debian/libtracker-extract-dev.install.in |
66 | - - rename debian/libtracker-miner-0.8-0.install => |
67 | + - rename debian/libtracker-miner-0.8-0.install => |
68 | debian/libtracker-miner.install.in |
69 | - rename debian/libtracker-miner-0.8-0.lintian-overrides => |
70 | debian/libtracker-miner.lintian-overrides.in |
71 | - - rename debian/libtracker-miner-0.8-dev.install => |
72 | + - rename debian/libtracker-miner-0.8-dev.install => |
73 | debian/libtracker-miner-dev.install.in |
74 | - rename debian/tracker-extract.install => debian/tracker-extract.install.in |
75 | - rename debian/tracker-gui.install => debian/tracker-gui.install.in |
76 | - - rename debian/tracker-gui.lintian-overrides => |
77 | + - rename debian/tracker-gui.lintian-overrides => |
78 | debian/tracker-gui.lintian-overrides.in |
79 | - rename debian/tracker.install => debian/tracker.install.in |
80 | - - rename debian/tracker-miner-evolution.install => |
81 | + - rename debian/tracker-miner-evolution.install => |
82 | debian/tracker-miner-evolution.install.in |
83 | - - rename debian/tracker-miner-evolution.lintian-overrides => |
84 | + - rename debian/tracker-miner-evolution.lintian-overrides => |
85 | debian/tracker-miner-evolution.lintian-overrides.in |
86 | - - rename debian/tracker-miner-fs.lintian-overrides => |
87 | + - rename debian/tracker-miner-fs.lintian-overrides => |
88 | debian/tracker-miner-fs.lintian-overrides.in |
89 | - - rename debian/tracker-utils.lintian-overrides => |
90 | + - rename debian/tracker-utils.lintian-overrides => |
91 | debian/tracker-utils.lintian-overrides.in |
92 | - update debian/control.in |
93 | - update debian/libtracker-client.install.in |
94 | @@ -74,7 +100,7 @@ |
95 | - update debian/libtracker-extract.lintian-overrides.in |
96 | - update debian/libtracker-extract-dev.install.in |
97 | - update debian/libtracker-miner.install.in |
98 | - - update debian/libtracker-miner.lintian-overrides.in |
99 | + - update debian/libtracker-miner.lintian-overrides.in |
100 | - update debian/libtracker-miner-dev.install.in |
101 | - update debian/tracker-extract.install.in |
102 | - update debian/tracker-gui.install.in |
103 | @@ -380,12 +406,12 @@ |
104 | automatically build without UNAC support when it |
105 | is not installed now. |
106 | - debian/tracker.install: |
107 | - + Don't install the DBus service so trackerd is not automatically |
108 | + + Don't install the DBus service so trackerd is not automatically |
109 | started when other software try to see if it's already running |
110 | - debian/patches/02_no_kde_autostart.patch: |
111 | + Do not autostart trackerd in KDE. |
112 | - debian/patches/03_dont_activate_indexing_and_watching.patch: |
113 | - + Don't active indexing nor watching as decided by the |
114 | + + Don't active indexing nor watching as decided by the |
115 | technical board. |
116 | - debian/patches/05_am_maintainer_mode.patch: |
117 | + Enable AM_MAINTAINER_MODE, to stop the build system being updated, |
118 | @@ -396,7 +422,7 @@ |
119 | + Automatically reindex if the index becomes corrupt as opposed |
120 | to displaying a notification with reindex action, which requires |
121 | user intervention and results in a confusing fallback notification. |
122 | - Reindexing is the only sane way to recover from a corrupt index |
123 | + Reindexing is the only sane way to recover from a corrupt index |
124 | anyway. |
125 | - debian/patches/20-tracker-defaults.patch: |
126 | + Don't disable the evolution module in the default config - we |
127 | @@ -405,7 +431,7 @@ |
128 | - debian/patches/99_autotools.patch: |
129 | + Autotools update. |
130 | - debian/tracker.postinst: |
131 | - + Start procps to apply "sysctl.d/30-tracker.conf" |
132 | + + Start procps to apply "sysctl.d/30-tracker.conf" |
133 | - debian/tracker.py: |
134 | + Apport hook to ignore tracker-extract crashes. The hook is not |
135 | installed since tracker-extract no longer limits memory with |
136 | @@ -417,7 +443,7 @@ |
137 | upstream. |
138 | * debian/control: |
139 | - Don't build-depend on evolution-dev or evolution-data-server-dev. |
140 | - The push-modules were disabled upstream, so these dependencies are |
141 | + The push-modules were disabled upstream, so these dependencies are |
142 | not required. |
143 | * Dropped patches merged upstream: |
144 | - 21_remove_all_indexes_on_reindex.patch. |
145 | @@ -429,7 +455,7 @@ |
146 | * debian/patches/11_drop_evolution_module.patch: |
147 | - Updated to hide the Evolution indexing option from the preferences |
148 | dialog. |
149 | - |
150 | + |
151 | -- Chris Coulson <chrisccoulson@googlemail.com> Mon, 15 Jun 2009 19:37:06 +0100 |
152 | |
153 | tracker (0.6.95-1) unstable; urgency=low |
154 | @@ -478,7 +504,7 @@ |
155 | - debian/patches/22_flush_stop_on_index_error.patch: |
156 | + Make sync/async flush functions to stop on any error. |
157 | - debian/patches/23_indexer_pause_on_index_error.patch: |
158 | - + Add new "index error" indexer status and pause the indexer |
159 | + + Add new "index error" indexer status and pause the indexer |
160 | on index error. |
161 | |
162 | -- Chris Coulson <chrisccoulson@googlemail.com> Thu, 04 Jun 2009 21:49:31 +0100 |
163 | @@ -490,7 +516,7 @@ |
164 | - Automatically reindex if the index becomes corrupt as opposed |
165 | to displaying a notification with reindex action, which requires |
166 | user intervention and results in a confusing fallback notification. |
167 | - Reindexing is the only sane way to recover from a corrupt index |
168 | + Reindexing is the only sane way to recover from a corrupt index |
169 | anyway (LP: #361205). |
170 | * debian/patches/21_remove_all_indexes_on_reindex.patch: |
171 | - Ensure that all index files are removed when a reindex is |
172 | @@ -568,14 +594,14 @@ |
173 | tracker (0.6.92-1ubuntu2) jaunty; urgency=low |
174 | |
175 | * debian/patches/11_drop_evolution_module.patch: |
176 | - - Updated to fully disable the old Evolution module. |
177 | - This corrects a warning when tracker-indexer first |
178 | + - Updated to fully disable the old Evolution module. |
179 | + This corrects a warning when tracker-indexer first |
180 | starts (LP: #354601). |
181 | * debian/patches/15_crasher-fix-from-svn-r3159.patch: |
182 | - Fix backported from SVN to fix a crash in the indexer |
183 | when unmounting removable devices (LP: #354362, LP: #354236). |
184 | * debian/patches/16_fixes-from-svn-r3167.patch: |
185 | - - Various fixes for memory leaks and corruption issues |
186 | + - Various fixes for memory leaks and corruption issues |
187 | backported from SVN revision 3167. Should fix LP: #340055. |
188 | * debian/tracker-utils.install: |
189 | - Install tracker-processes utility. |
190 | @@ -601,17 +627,17 @@ |
191 | automatically build without UNAC support when it |
192 | is not installed now. |
193 | - debian/tracker.install: |
194 | - + Don't install the DBus service so trackerd is not automatically |
195 | + + Don't install the DBus service so trackerd is not automatically |
196 | started when other software try to see if it's already running |
197 | - + Install tracker.py in /usr/share/apport/package-hooks/ |
198 | + + Install tracker.py in /usr/share/apport/package-hooks/ |
199 | - debian/tracker.postinst: |
200 | - + Start procps to apply "sysctl.d/30-tracker.conf" |
201 | + + Start procps to apply "sysctl.d/30-tracker.conf" |
202 | - debian/tracker.py: |
203 | + Added an apport hook to ignore tracker-extract crashes, since they |
204 | are caused by setrlimit terminating tracker-extract when it raises |
205 | it's cpu/memory limit. |
206 | - debian/patches/03_dont_activate_indexing_and_watching.patch: |
207 | - + Don't active indexing nor watching as decided by the |
208 | + + Don't active indexing nor watching as decided by the |
209 | technical board. |
210 | - debian/patches/02_no_kde_autostart.patch: |
211 | + Do not autostart trackerd in KDE, as they have strigi. |
212 | @@ -655,20 +681,20 @@ |
213 | libunac1-dev, libqdbm-dev. |
214 | + tracker depends on procps. |
215 | - debian/30-tracker.conf: |
216 | - + Increase maximum number of inotify watches to 524288. |
217 | + + Increase maximum number of inotify watches to 524288. |
218 | - debian/rules: |
219 | + Enable sqlite external db instead of qdbm. |
220 | + Pass --disable-unac to configure. The new version won't |
221 | automatically build without UNAC support when it |
222 | is not installed now. |
223 | - debian/tracker.install: |
224 | - + Don't install the DBus service so trackerd is not automatically |
225 | + + Don't install the DBus service so trackerd is not automatically |
226 | started when other software try to see if it's already running |
227 | + Install tracker.py in /usr/share/apport/package-hooks/ |
228 | - debian/patches/02_no_kde_autostart.patch: |
229 | + Do not autostart trackerd in KDE, as they have strigi. |
230 | - debian/patches/03_dont_activate_indexing_and_watching.patch: |
231 | - + Don't active indexing nor watching as decided by the |
232 | + + Don't active indexing nor watching as decided by the |
233 | technical board. |
234 | - debian/tracker.postinst: |
235 | + Start procps to apply "sysctl.d/30-tracker.conf" |
236 | @@ -678,7 +704,7 @@ |
237 | it's cpu/memory limit. |
238 | * debian/patches/03_dont_activate_indexing_and_watching.patch: |
239 | - Updated for new version. |
240 | - |
241 | + |
242 | -- Chris Coulson <chrisccoulson@googlemail.com> Wed, 18 Mar 2009 23:57:41 +0000 |
243 | |
244 | tracker (0.6.91-1) unstable; urgency=low |
245 | @@ -750,10 +776,10 @@ |
246 | - debian/patches/02_no_kde_autostart.patch: |
247 | + Do not autostart trackerd in KDE, as they have strigi. |
248 | - debian/patches/03_dont_activate_indexing_and_watching.patch: |
249 | - + Don't active indexing nor watching as decided by the |
250 | + + Don't active indexing nor watching as decided by the |
251 | technical board. |
252 | - debian/patches/05_gnomedesktop.patch: |
253 | - + Use python module gnomedesktop directly rather than |
254 | + + Use python module gnomedesktop directly rather than |
255 | deskbar.core.gnomedesktop python module |
256 | - debian/rules: |
257 | + Enable sqlite external db instead of qdbm. |
258 | @@ -767,7 +793,7 @@ |
259 | are caused by setrlimit terminating tracker-extract when it raises |
260 | it's cpu/memory limit. |
261 | - debian/tracker.install: |
262 | - + Don't install the DBus service so tracker is not automatically |
263 | + + Don't install the DBus service so tracker is not automatically |
264 | started when other software try to see if it's already running |
265 | + Install tracker.py in /usr/share/apport/package-hooks/ |
266 | - debian/tracker.postinst: |
267 | @@ -864,13 +890,13 @@ |
268 | + 05_gnomedesktop.patch: use python module gnomedesktop directly rather |
269 | than deskbar.core.gnomedesktop python module |
270 | - debian/tracker.install: |
271 | - + don't install the dbus service so tracker is not automatically |
272 | + + don't install the dbus service so tracker is not automatically |
273 | started when other software try to see if it's already running |
274 | (lp: #204770) |
275 | * new recommends on odt2txt |
276 | * drop o3read dependency (no longer in the archive) |
277 | |
278 | - |
279 | + |
280 | -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Nov 2008 15:34:51 +0100 |
281 | |
282 | tracker (0.6.6-2) unstable; urgency=low |
283 | @@ -882,7 +908,7 @@ |
284 | * debian/patches/01-secure_tmpdir.patch |
285 | - Use mktemp to create a secure tmpdir for the msword filter. |
286 | Thanks to Jon Dowland for the patch. Closes: #473733 |
287 | - * Add symbols files for libtrackerclient0 and libtracker-gtk0. |
288 | + * Add symbols files for libtrackerclient0 and libtracker-gtk0. |
289 | * debian/patches/02-static_keywords_reply.patch |
290 | - Make _keywords_reply a static function to not export it in the public |
291 | API. |
292 | @@ -1326,7 +1352,7 @@ |
293 | - Improved stopwords |
294 | - New deskbar handler that uses the new deskbar api (2.19+) |
295 | - Fixed old deskbar handler to remove race condition causing crashes |
296 | - - Fixed a number of annoying bugs in email indexing and tracker |
297 | + - Fixed a number of annoying bugs in email indexing and tracker |
298 | preferences (LP: #132921) |
299 | * debian/libdeskbar-tracker.install: |
300 | - updated |
301 | @@ -1369,16 +1395,16 @@ |
302 | tracker (0.6.0-1) unstable; urgency=low |
303 | |
304 | * New upstream release. |
305 | - - Uses XDG directories to store the settings, cache, database and log |
306 | + - Uses XDG directories to store the settings, cache, database and log |
307 | files. Closes: #414860 |
308 | - - Fixes the crash of the deskbar applet at session start. Closes: #434078 |
309 | + - Fixes the crash of the deskbar applet at session start. Closes: #434078 |
310 | - Does not fall back to polling when the inotify limit is exceeded. |
311 | Closes: #412089 |
312 | - Correctly uses xdg-open to open the search results with the preferred |
313 | application. This requires the xdg-utils package to be installed, which |
314 | is a Recommends of tracker-search-tool. Closes: 415705 |
315 | - * Removed debian/man/ as the man pages are now shipped upstream. |
316 | - Update tracker.manpages, tracker-search-tool.manpages and |
317 | + * Removed debian/man/ as the man pages are now shipped upstream. |
318 | + Update tracker.manpages, tracker-search-tool.manpages and |
319 | tracker-utils.manpages accordingly. |
320 | * Removed patches that were applied upstream or are now obsolete |
321 | - debian/patches/20-trackerd_manpage.patch |
322 | @@ -1413,7 +1439,7 @@ |
323 | tracker (0.5.4-6) unstable; urgency=low |
324 | |
325 | * Rebuild against poppler 0.5.4. Closes: #427815 |
326 | - * Don't install htmless binary and man page anymore. |
327 | + * Don't install htmless binary and man page anymore. |
328 | The html filter now uses w3m. |
329 | |
330 | -- Michael Biebl <biebl@debian.org> Wed, 06 Jun 2007 22:39:00 +0200 |
331 | @@ -1472,7 +1498,7 @@ |
332 | * debian/control: |
333 | - Add Recommends: untex to tracker and Recommends: xdg-utils to |
334 | tracker-search-tool. |
335 | - - Add libmagic-dev as new build depencency. |
336 | + - Add libmagic-dev as new build depencency. |
337 | |
338 | [ Michael Biebl ] |
339 | * Review Johan's work and upload to unstable. |
340 | |
341 | === modified file 'debian/control' |
342 | --- debian/control 2010-08-06 01:00:30 +0000 |
343 | +++ debian/control 2010-10-21 20:41:35 +0000 |
344 | @@ -8,14 +8,12 @@ |
345 | autotools-dev, |
346 | pkg-config, |
347 | intltool (>= 0.35.0), |
348 | - libglib2.0-dev (>= 2.20.0), |
349 | - libpango1.0-dev (>= 1.0.0), |
350 | - libdbus-1-dev (>= 1.0), |
351 | - libdbus-glib-1-dev (>= 0.78), |
352 | + libglib2.0-dev (>= 2.24.0), |
353 | + libdbus-1-dev (>= 1.3.1), |
354 | + libdbus-glib-1-dev (>= 0.82), |
355 | libgstreamer0.10-dev (>= 0.10.12), |
356 | libgstreamer-plugins-base0.10-dev (>= 0.10.12), |
357 | - libsqlite3-dev (>= 3.6.17), |
358 | - libpoppler-dev (>= 0.12.2), |
359 | + libsqlite3-dev (>= 3.7.1), |
360 | libgsf-1-dev (>= 1.13), |
361 | libexif-dev (>= 0.6), |
362 | libpng12-dev (>= 1.2), |
363 | @@ -27,8 +25,6 @@ |
364 | zlib1g-dev, |
365 | libexempi-dev (>= 2.1.0), |
366 | libnotify-dev (>= 0.4.3), |
367 | - python-support (>= 0.6), |
368 | - quilt, |
369 | evolution-dev (>= 2.25.5), |
370 | evolution-data-server-dev (>= 2.25.5), |
371 | libpanel-applet2-dev, |
372 | @@ -39,14 +35,14 @@ |
373 | libiptcdata0-dev, |
374 | uuid-dev, |
375 | libgee-dev (>= 0.3), |
376 | - valac, |
377 | gtk-doc-tools, |
378 | graphviz, |
379 | librest-dev (>= 0.6), |
380 | libnm-glib-dev (>= 0.8), |
381 | libgif-dev, |
382 | - libgnome-keyring-dev (>= 2.26) |
383 | -Standards-Version: 3.8.4 |
384 | + libgnome-keyring-dev (>= 2.26), |
385 | + libunistring-dev |
386 | +Standards-Version: 3.9.0 |
387 | Vcs-Git: git://git.debian.org/git/users/biebl/tracker.git |
388 | Vcs-Browser: http://git.debian.org/?p=users/biebl/tracker.git;a=summary |
389 | Homepage: http://www.tracker-project.org/ |
390 | @@ -87,7 +83,34 @@ |
391 | libglib2.0-dev |
392 | Description: metadata database, indexer and search tool - development files |
393 | This package contains the static libraries and header files needed to link |
394 | - applications with libtrackerclient. |
395 | + applications with libtracker-client. |
396 | + . |
397 | + Tracker is an advanced framework for first class objects with associated |
398 | + metadata and tags. It provides a one stop solution for all metadata, tags, |
399 | + shared object databases, search tools and indexing. |
400 | + |
401 | +Package: libtracker-sparql-0.9-0 |
402 | +Architecture: any |
403 | +Section: libs |
404 | +Depends: ${shlibs:Depends}, |
405 | + ${misc:Depends} |
406 | +Description: metadata database, indexer and search tool - library |
407 | + This package contains the library that is used by applications to access |
408 | + the Tracker daemon and database. |
409 | + . |
410 | + Tracker is an advanced framework for first class objects with associated |
411 | + metadata and tags. It provides a one stop solution for all metadata, tags, |
412 | + shared object databases, search tools and indexing. |
413 | + |
414 | +Package: libtracker-sparql-0.9-dev |
415 | +Architecture: any |
416 | +Section: libdevel |
417 | +Depends: libtracker-sparql-0.9-0 (= ${binary:Version}), |
418 | + ${misc:Depends}, |
419 | + libglib2.0-dev |
420 | +Description: metadata database, indexer and search tool - development files |
421 | + This package contains the static libraries and header files needed to link |
422 | + applications with libtracker-sparql. |
423 | . |
424 | Tracker is an advanced framework for first class objects with associated |
425 | metadata and tags. It provides a one stop solution for all metadata, tags, |
426 | @@ -107,7 +130,7 @@ |
427 | Section: libdevel |
428 | Depends: libtracker-miner-0.9-0 (= ${binary:Version}), |
429 | ${misc:Depends}, |
430 | - libtracker-client-0.9-dev, |
431 | + libtracker-sparql-0.9-dev, |
432 | libglib2.0-dev |
433 | Description: tracker data miner library - development files |
434 | This package contains the static libraries and header files needed to link |
435 | @@ -129,7 +152,7 @@ |
436 | Section: libdevel |
437 | Depends: libtracker-extract-0.9-0 (= ${binary:Version}), |
438 | ${misc:Depends}, |
439 | - libtracker-client-0.9-dev, |
440 | + libtracker-sparql-0.9-dev, |
441 | libglib2.0-dev |
442 | Description: tracker extractor library - development files |
443 | This package contains the static libraries and header files needed to link |
444 | @@ -164,9 +187,12 @@ |
445 | Section: gnome |
446 | Depends: ${shlibs:Depends}, |
447 | ${misc:Depends}, |
448 | - tracker (= ${binary:Version}) |
449 | -Conflicts: tracker-search-tool |
450 | -Replaces: tracker-search-tool |
451 | + tracker (= ${binary:Version}), |
452 | + gnome-icon-theme |
453 | +Breaks: tracker-search-tool (<< 0.8.1-1), |
454 | + tracker (<< 0.8.1-1) |
455 | +Replaces: tracker-search-tool (<< 0.8.1-1), |
456 | + tracker (<< 0.8.1-1) |
457 | Description: metadata database, indexer and search tool - GNOME frontend |
458 | This package provides a graphical Tracker search tool for GNOME. |
459 | . |
460 | @@ -179,8 +205,7 @@ |
461 | Depends: ${shlibs:Depends}, |
462 | ${misc:Depends}, |
463 | tracker (= ${binary:Version}) |
464 | -Recommends: unzip, |
465 | - odt2txt |
466 | +Recommends: gzip |
467 | Description: metadata database, indexer and search tool - metadata extractors |
468 | This package contains the metadata extractors. |
469 | . |
470 | @@ -188,24 +213,6 @@ |
471 | metadata and tags. It provides a one stop solution for all metadata, tags, |
472 | shared object databases, search tools and indexing. |
473 | |
474 | -#Package: libdeskbar-tracker |
475 | -#Architecture: all |
476 | -#Depends: ${misc:Depends}, |
477 | -# ${python:Depends}, |
478 | -# python-dbus (>= 0.41), |
479 | -# python-gnome2, |
480 | -# python-gobject, |
481 | -# python-gnomedesktop, |
482 | -# deskbar-applet (>= 2.20.0), |
483 | -# tracker |
484 | -#Recommends: tracker-gui |
485 | -#Description: metadata database, indexer and search tool - deskbar-applet plugin |
486 | -# This package provides a deskbar-applet plugin for Tracker. |
487 | -# . |
488 | -# Tracker is an advanced framework for first class objects with associated |
489 | -# metadata and tags. It provides a one stop solution for all metadata, tags, |
490 | -# shared object databases, search tools and indexing. |
491 | - |
492 | Package: tracker-miner-fs |
493 | Architecture: any |
494 | Depends: ${shlibs:Depends}, |
495 | |
496 | === modified file 'debian/control.in' |
497 | --- debian/control.in 2010-08-06 01:00:30 +0000 |
498 | +++ debian/control.in 2010-10-21 20:41:35 +0000 |
499 | @@ -9,12 +9,11 @@ |
500 | pkg-config, |
501 | intltool (>= 0.35.0), |
502 | libglib2.0-dev (>= 2.24.0), |
503 | - libpango1.0-dev (>= 1.0.0), |
504 | - libdbus-1-dev (>= 1.0), |
505 | - libdbus-glib-1-dev (>= 0.78), |
506 | + libdbus-1-dev (>= 1.3.1), |
507 | + libdbus-glib-1-dev (>= 0.82), |
508 | libgstreamer0.10-dev (>= 0.10.12), |
509 | libgstreamer-plugins-base0.10-dev (>= 0.10.12), |
510 | - libsqlite3-dev (>= 3.6.17), |
511 | + libsqlite3-dev (>= 3.7.1), |
512 | libgsf-1-dev (>= 1.13), |
513 | libexif-dev (>= 0.6), |
514 | libpng12-dev (>= 1.2), |
515 | @@ -36,13 +35,13 @@ |
516 | libiptcdata0-dev, |
517 | uuid-dev, |
518 | libgee-dev (>= 0.3), |
519 | - valac, |
520 | gtk-doc-tools, |
521 | graphviz, |
522 | librest-dev (>= 0.6), |
523 | libnm-glib-dev (>= 0.8), |
524 | libgif-dev, |
525 | - libgnome-keyring-dev (>= 2.26) |
526 | + libgnome-keyring-dev (>= 2.26), |
527 | + libunistring-dev |
528 | Standards-Version: 3.9.0 |
529 | Vcs-Git: git://git.debian.org/git/users/biebl/tracker.git |
530 | Vcs-Browser: http://git.debian.org/?p=users/biebl/tracker.git;a=summary |
531 | @@ -84,7 +83,34 @@ |
532 | libglib2.0-dev |
533 | Description: metadata database, indexer and search tool - development files |
534 | This package contains the static libraries and header files needed to link |
535 | - applications with libtrackerclient. |
536 | + applications with libtracker-client. |
537 | + . |
538 | + Tracker is an advanced framework for first class objects with associated |
539 | + metadata and tags. It provides a one stop solution for all metadata, tags, |
540 | + shared object databases, search tools and indexing. |
541 | + |
542 | +Package: libtracker-sparql-@APIVER@-@SONAME@ |
543 | +Architecture: any |
544 | +Section: libs |
545 | +Depends: ${shlibs:Depends}, |
546 | + ${misc:Depends} |
547 | +Description: metadata database, indexer and search tool - library |
548 | + This package contains the library that is used by applications to access |
549 | + the Tracker daemon and database. |
550 | + . |
551 | + Tracker is an advanced framework for first class objects with associated |
552 | + metadata and tags. It provides a one stop solution for all metadata, tags, |
553 | + shared object databases, search tools and indexing. |
554 | + |
555 | +Package: libtracker-sparql-@APIVER@-dev |
556 | +Architecture: any |
557 | +Section: libdevel |
558 | +Depends: libtracker-sparql-@APIVER@-@SONAME@ (= ${binary:Version}), |
559 | + ${misc:Depends}, |
560 | + libglib2.0-dev |
561 | +Description: metadata database, indexer and search tool - development files |
562 | + This package contains the static libraries and header files needed to link |
563 | + applications with libtracker-sparql. |
564 | . |
565 | Tracker is an advanced framework for first class objects with associated |
566 | metadata and tags. It provides a one stop solution for all metadata, tags, |
567 | @@ -104,7 +130,7 @@ |
568 | Section: libdevel |
569 | Depends: libtracker-miner-@APIVER@-@SONAME@ (= ${binary:Version}), |
570 | ${misc:Depends}, |
571 | - libtracker-client-@APIVER@-dev, |
572 | + libtracker-sparql-@APIVER@-dev, |
573 | libglib2.0-dev |
574 | Description: tracker data miner library - development files |
575 | This package contains the static libraries and header files needed to link |
576 | @@ -126,7 +152,7 @@ |
577 | Section: libdevel |
578 | Depends: libtracker-extract-@APIVER@-@SONAME@ (= ${binary:Version}), |
579 | ${misc:Depends}, |
580 | - libtracker-client-@APIVER@-dev, |
581 | + libtracker-sparql-@APIVER@-dev, |
582 | libglib2.0-dev |
583 | Description: tracker extractor library - development files |
584 | This package contains the static libraries and header files needed to link |
585 | @@ -179,8 +205,7 @@ |
586 | Depends: ${shlibs:Depends}, |
587 | ${misc:Depends}, |
588 | tracker (= ${binary:Version}) |
589 | -Recommends: unzip, |
590 | - odt2txt |
591 | +Recommends: gzip |
592 | Description: metadata database, indexer and search tool - metadata extractors |
593 | This package contains the metadata extractors. |
594 | . |
595 | |
596 | === modified file 'debian/copyright' |
597 | --- debian/copyright 2010-05-20 18:43:29 +0000 |
598 | +++ debian/copyright 2010-10-21 20:41:35 +0000 |
599 | @@ -10,10 +10,11 @@ |
600 | Philip Van Hoof <philip@codeminded.be> |
601 | Jürg Billeter <j@bitron.ch> |
602 | Mikael Ottela <mikael.ottela@ixonos.com> |
603 | + Aleksander Morgado <aleksander@lanedo.com> |
604 | |
605 | Copyright: |
606 | Copyright (C) 2006, Jamie McCracken <jamiemcc@gnome.org> |
607 | - Copyright (C) 2008, Nokia <ivan.frade@nokia.com> |
608 | + Copyright (C) 2008-2010 Nokia <ivan.frade@nokia.com> |
609 | |
610 | License: |
611 | All files if not specified otherwise are licensed under the GPL v2 or later. |
612 | @@ -57,6 +58,24 @@ |
613 | License: LGPL v2.1 or later |
614 | |
615 | =============================================================================== |
616 | +src/libtracker-bus/* |
617 | + |
618 | +Copyright (C) 2010, Nokia <ivan.frade@nokia.com> |
619 | +License: LGPL v2.1 or later |
620 | + |
621 | +=============================================================================== |
622 | +src/libtracker-direct/* |
623 | + |
624 | +Copyright (C) 2010, Nokia <ivan.frade@nokia.com> |
625 | +License: LGPL v2.1 or later |
626 | + |
627 | +=============================================================================== |
628 | +src/libtracker-sparql/* |
629 | + |
630 | +Copyright (C) 2010, Nokia <ivan.frade@nokia.com> |
631 | +License: LGPL v2.1 or later |
632 | + |
633 | +=============================================================================== |
634 | src/libtracker-extract/* |
635 | |
636 | Copyright (C) 2006, Jamie McCracken <jamiemcc@gnome.org> |
637 | @@ -89,10 +108,10 @@ |
638 | * Redistributions of source code must retain the above copyright notice, |
639 | this list of conditions and the following disclaimer. |
640 | * Redistributions in binary form must reproduce the above copyright notice, |
641 | - this list of conditions and the following disclaimer in the documentation |
642 | + this list of conditions and the following disclaimer in the documentation |
643 | and/or other materials provided with the distribution. |
644 | * Neither the name of the <ORGANIZATION> nor the names of its contributors |
645 | - may be used to endorse or promote products derived from this software |
646 | + may be used to endorse or promote products derived from this software |
647 | without specific prior written permission. |
648 | |
649 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND |
650 | |
651 | === modified file 'debian/libtracker-client.install.in' |
652 | --- debian/libtracker-client.install.in 2010-04-05 23:43:38 +0000 |
653 | +++ debian/libtracker-client.install.in 2010-10-21 20:41:35 +0000 |
654 | @@ -1,2 +1,1 @@ |
655 | usr/lib/libtracker-client-@APIVER@.so.* |
656 | -usr/lib/tracker-@APIVER@/libtracker-common.so.* |
657 | |
658 | === added file 'debian/libtracker-sparql-dev.install.in' |
659 | --- debian/libtracker-sparql-dev.install.in 1970-01-01 00:00:00 +0000 |
660 | +++ debian/libtracker-sparql-dev.install.in 2010-10-21 20:41:35 +0000 |
661 | @@ -0,0 +1,5 @@ |
662 | +usr/lib/libtracker-sparql-@APIVER@.so |
663 | +usr/lib/pkgconfig/tracker-sparql-@APIVER@.pc |
664 | +usr/include/tracker-@APIVER@/libtracker-sparql/*.h |
665 | +usr/share/vala/vapi/tracker-sparql-@APIVER@.vapi |
666 | +usr/share/gtk-doc/html/libtracker-sparql/ |
667 | |
668 | === added file 'debian/libtracker-sparql.install.in' |
669 | --- debian/libtracker-sparql.install.in 1970-01-01 00:00:00 +0000 |
670 | +++ debian/libtracker-sparql.install.in 2010-10-21 20:41:35 +0000 |
671 | @@ -0,0 +1,3 @@ |
672 | +usr/lib/libtracker-sparql-@APIVER@.so.* |
673 | +usr/lib/tracker-@APIVER@/sparql-modules/*.so |
674 | +usr/lib/tracker-@APIVER@/libtracker-common.so.* |
675 | |
676 | === modified file 'debian/rules' |
677 | --- debian/rules 2010-08-06 01:07:06 +0000 |
678 | +++ debian/rules 2010-10-21 20:41:35 +0000 |
679 | @@ -1,5 +1,5 @@ |
680 | #!/usr/bin/make -f |
681 | - |
682 | + |
683 | include /usr/share/cdbs/1/rules/debhelper.mk |
684 | include /usr/share/cdbs/1/class/gnome.mk |
685 | include /usr/share/cdbs/1/rules/utils.mk |
686 | @@ -24,11 +24,14 @@ |
687 | LDFLAGS += -Wl,--as-needed -Wl,-Bsymbolic |
688 | |
689 | tracker_libs = \ |
690 | + libtracker-sparql \ |
691 | libtracker-client \ |
692 | libtracker-extract \ |
693 | libtracker-miner |
694 | |
695 | subst_files = \ |
696 | + debian/libtracker-sparql.install \ |
697 | + debian/libtracker-sparql-dev.install \ |
698 | debian/libtracker-client.install \ |
699 | debian/libtracker-client-dev.install \ |
700 | debian/libtracker-extract.install \ |
701 | @@ -46,13 +49,13 @@ |
702 | debian/tracker-miner-fs.lintian-overrides \ |
703 | debian/tracker-utils.lintian-overrides \ |
704 | debian/tracker-miner-flickr.lintian-overrides |
705 | - |
706 | + |
707 | # Enforce tight shlibs dependencies |
708 | DEB_DH_MAKESHLIBS_ARGS_ALL := -V -X/usr/lib/tracker-$(APIVER)/writeback-modules/ \ |
709 | -X/usr/lib/tracker-$(APIVER)/extract-modules/ \ |
710 | - -X/usr/lib/tracker-$(APIVER)/push-modules/ \ |
711 | + -X/usr/lib/tracker-$(APIVER)/sparql-modules/ \ |
712 | -X$(EVOPLUGDIR) \ |
713 | - -X$(NAUTILUSEXTDIR) |
714 | + -X$(NAUTILUSEXTDIR) |
715 | |
716 | % : %.in |
717 | sed -e 's,@APIVER@,$(APIVER),g' \ |
718 | |
719 | === modified file 'debian/tracker.install.in' |
720 | --- debian/tracker.install.in 2010-05-20 18:43:29 +0000 |
721 | +++ debian/tracker.install.in 2010-10-21 20:41:35 +0000 |
722 | @@ -6,12 +6,9 @@ |
723 | usr/share/tracker/tracker-miner-web.xml |
724 | usr/share/tracker/tracker-statistics.xml |
725 | usr/share/tracker/tracker-backup.xml |
726 | -usr/share/tracker/tracker-resources-class.xml |
727 | usr/share/tracker/tracker-resources.xml |
728 | usr/share/tracker/tracker-status.xml |
729 | |
730 | -usr/share/tracker/*.sql |
731 | - |
732 | usr/lib/tracker/tracker-store |
733 | |
734 | usr/share/man/man1/tracker-store.1 |
735 | @@ -25,4 +22,3 @@ |
736 | etc/xdg/autostart/tracker-store.desktop |
737 | |
738 | usr/lib/tracker-@APIVER@/libtracker-data.so.* |
739 | -usr/lib/tracker-@APIVER@/push-modules/daemon/*.so |
Thanks, I've merged this now