>From 5a04a2cb01c8af7eb06c38167b19cc0463c56a2e Mon Sep 17 00:00:00 2001
From: Juan A. Suarez Romero <jasuarez igalia com>
Date: Fri, 20 Nov 2009 09:07:35 +0000
Subject: [PATCH] Install Tracker 0.7 in Fremantle
These changes allow to install Tracker 0.7 in Fremantle, and live together with
default Tracker 0.6.
---
configure.ac | 2 +-
debian/{23tracker => 23tracker07} | 2 +-
debian/changelog | 6 ++++
debian/control | 32 +++++++++----------
debian/rules | 4 +-
debian/tracker-0.7.install | 19 ++++++++++++
...ker-tests.install => tracker-tests-0.7.install} | 0
debian/tracker-utils-0.7.install | 7 ++++
debian/tracker-utils.install | 7 ----
debian/tracker.install | 19 ------------
debian/{tracker-cud.sh => tracker07-cud.sh} | 0
debian/{tracker.sh => tracker07.sh} | 2 +-
12 files changed, 52 insertions(+), 48 deletions(-)
rename debian/{23tracker => 23tracker07} (94%)
create mode 100644 debian/tracker-0.7.install
rename debian/{tracker-tests.install => tracker-tests-0.7.install} (100%)
create mode 100644 debian/tracker-utils-0.7.install
delete mode 100644 debian/tracker-utils.install
delete mode 100644 debian/tracker.install
rename debian/{tracker-cud.sh => tracker07-cud.sh} (100%)
rename debian/{tracker.sh => tracker07.sh} (95%)
diff --git a/configure.ac b/configure.ac
index b844c66..7f9b26d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,7 +659,7 @@ AC_CHECK_HEADERS([sys/inotify.h])
# 3.6.11 for sqlite_backup API
# 3.6.16 to fix test failures
-SQLITE_REQUIRED=3.6.16
+SQLITE_REQUIRED=3.6.14
PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= $SQLITE_REQUIRED])
AC_SUBST(SQLITE3_CFLAGS)
diff --git a/debian/23tracker b/debian/23tracker07
similarity index 94%
rename from debian/23tracker
rename to debian/23tracker07
index 526464b..a7d4419 100755
--- a/debian/23tracker
+++ b/debian/23tracker07
@@ -17,4 +17,4 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-/usr/lib/tracker/tracker-miner-fs &
+/usr/lib/tracker-0.7/tracker-miner-fs &
diff --git a/debian/changelog b/debian/changelog
index d224be8..66cb234 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tracker-0.7 (0.7.7-4maemo1) unstable; urgency=low
+
+ * Renamed package to tracker-0.7. This allows to install together with tracker 0.6.x
+
+ -- Juan A. Suarez Romero <jasuarez igalia com> Fri, 20 Nov 2009 09:59:39 +0100
+
tracker (0.7.7-3maemo1) unstable; urgency=low
* Implemented SWP#MCoFr-384
diff --git a/debian/control b/debian/control
index f3a9365..672b9cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: tracker
+Source: tracker-0.7
Section: utils
Priority: optional
Maintainer: Urho Konttori <urho konttori nokia com>
@@ -6,41 +6,39 @@ XS-Python-Version: all
Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev,
libxml-parser-perl, libglib2.0-dev (>= 2.16.0), libpango1.0-dev
(>=1.0.0), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60),
- libsqlite3-dev (>= 3.6.16),
+ libsqlite3-dev (>= 3.6.14),
libexif-dev (>= 0.6), libpng12-dev
(>=1.2), libgtk2.0-dev (>= 2.8.0), zlib1g-dev, intltool, libhal-dev
(>= 0.5.10), libhal-storage-dev (>= 0.5.10), gtk-doc-tools,
libexempi-dev, libjpeg62-dev, valac (>= 0.7.5),
libtiff4-dev (>= 3.8.2), libxml2-dev,
libgstreamer0.10-dev (>= 0.10.20), libgstreamer-plugins-base0.10-dev
- (>= 0.10.20), libiptcdata0-dev, uuid-dev, libquill-dev (>= 1.091014.0+0m6),
- libquillimagefilter-dev (>= 1.091006.0+0m6)
+ (>= 0.10.20), libiptcdata0-dev, uuid-dev
Standards-Version: 3.7.2
-Package: tracker
+Package: tracker-0.7
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, shared-mime-info, dbus,
libhal1, libhal-storage1, libexempi3,
libjpeg62, libgstreamer0.10-0, libgstreamer-plugins-base0.10-0,
libtiff4 (>= 3.8.2), libxml2,
- libiptcdata0, libuuid1, libquill1 (>= 1.091014.0+0m6),
- libquillimagefilter1 (>= 1.091014.0+0m6)
-Recommends: tracker-utils, unzip, wv,
+ libiptcdata0, libuuid1
+Recommends: tracker-utils-0.7, unzip, wv,
xsltproc, w3m, untex, o3read,
gstreamer0.10-plugins-base, gstreamer0.10-plugins-good
Suggests: evince, djvulibre-bin, gnumeric
Description: All-in-one indexer, search tool and metadata database.
-Package: tracker-dbg
+Package: tracker-0.7-dbg
Architecture: any
Priority: extra
-Depends: tracker (= ${binary:Version})
+Depends: tracker-0.7 (= ${binary:Version})
Description: All-in-one indexer, search tool and metadata database.
-Package: tracker-tests
+Package: tracker-tests-0.7
Architecture: any
-Depends: testrunner, tracker (= ${binary:Version}), python2.5, python-dbus
-XB-Maemo-CI-Packages: tracker
+Depends: testrunner, tracker-0.7 (= ${binary:Version}), python2.5, python-dbus
+XB-Maemo-CI-Packages: tracker-0.7
XB-Maemo-CI-Stage: fast, staging, acceptance
Description: Tests for tracker
Functional tests for tracker to be run once tracker is installed
@@ -65,9 +63,9 @@ Depends: libtracker-client-0.7-0 (= ${binary:Version}), libglib2.0-dev,
libdbus-1-dev, libdbus-glib-1-dev
Description: Tracker client side library to access indexed data.
-Package: tracker-utils
+Package: tracker-utils-0.7
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tracker (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tracker-0.7 (= ${binary:Version})
Description: Tracker command line applications to lookup data
Included utilities for Tracker:
* tracker-import: Import TTL files.
@@ -77,8 +75,8 @@ Description: Tracker command line applications to lookup data
* tracker-status: Get the current state of the daemon (idle/indexing/etc).
* tracker-tag: Add, remove, list tags for specific files.
-Package: tracker-utils-dbg
+Package: tracker-utils-0.7-dbg
Architecture: any
Priority: extra
-Depends: tracker-utils (= ${binary:Version})
+Depends: tracker-utils-0.7 (= ${binary:Version})
Description: Tracker command line applications to lookup data
diff --git a/debian/rules b/debian/rules
index 158c222..a07e981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/utils.mk
# Skip .svn dirs if any in the build directories
DEB_DH_ALWAYS_EXCLUDE := .svn
-DEB_DH_STRIP_ARGS := --dbg-package=tracker --dbg-package=libtracker-client-0.7 --dbg-package=tracker-utils
+DEB_DH_STRIP_ARGS := --dbg-package=tracker-0.7 --dbg-package=libtracker-client-0.7 --dbg-package=tracker-utils-0.7
DEB_CONFIGURE_EXTRA_FLAGS := \
--with-compile-warnings=no \
@@ -40,7 +40,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--disable-hildon-thumbnail \
--disable-evolution-push-module \
--disable-kmail-push-module \
- --enable-quill \
+ --disable-quill \
--disable-gdkpixbuf
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
diff --git a/debian/tracker-0.7.install b/debian/tracker-0.7.install
new file mode 100644
index 0000000..621374f
--- /dev/null
+++ b/debian/tracker-0.7.install
@@ -0,0 +1,19 @@
+debian/tmp/usr/share/dbus-1/services/
+debian/tmp/usr/share/tracker-0.7/*.xml
+debian/tmp/usr/share/tracker-0.7/*.sql
+debian/tmp/usr/share/tracker-0.7/languages/
+debian/tmp/usr/share/tracker-0.7/miners/
+debian/tmp/usr/share/tracker-0.7/ontologies/
+debian/tmp/usr/lib/tracker-0.7/*.so.*
+debian/tmp/usr/lib/tracker-0.7/*.so
+debian/tmp/usr/bin/tracker-control
+debian/tmp/usr/lib/tracker-0.7/tracker-store
+debian/tmp/usr/lib/tracker-0.7/tracker-miner-fs
+debian/tmp/usr/lib/tracker-0.7/tracker-extract
+debian/tmp/usr/lib/tracker-0.7/extract-modules/*.so
+debian/tmp/usr/lib/tracker-0.7/extract-modules/*.so*
+debian/tmp/etc/xdg/autostart/tracker-miner-fs.desktop
+debian/tmp/etc/xdg/autostart/tracker-miner-fs.desktop usr/share/autostart/
+debian/tracker07.sh etc/osso-af-init
+debian/tracker07-cud.sh etc/osso-cud-scripts
+debian/23tracker07 etc/X11/Xsession.post/
diff --git a/debian/tracker-tests.install b/debian/tracker-tests-0.7.install
similarity index 100%
rename from debian/tracker-tests.install
rename to debian/tracker-tests-0.7.install
diff --git a/debian/tracker-utils-0.7.install b/debian/tracker-utils-0.7.install
new file mode 100644
index 0000000..05cd8ab
--- /dev/null
+++ b/debian/tracker-utils-0.7.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin/tracker-import
+debian/tmp/usr/bin/tracker-info-0.7
+debian/tmp/usr/bin/tracker-search-0.7
+debian/tmp/usr/bin/tracker-sparql
+debian/tmp/usr/bin/tracker-stats-0.7
+debian/tmp/usr/bin/tracker-status-0.7
+debian/tmp/usr/bin/tracker-tag-0.7
diff --git a/debian/tracker-utils.install b/debian/tracker-utils.install
deleted file mode 100644
index 556c11a..0000000
--- a/debian/tracker-utils.install
+++ /dev/null
@@ -1,7 +0,0 @@
-debian/tmp/usr/bin/tracker-import
-debian/tmp/usr/bin/tracker-info
-debian/tmp/usr/bin/tracker-search
-debian/tmp/usr/bin/tracker-sparql
-debian/tmp/usr/bin/tracker-stats
-debian/tmp/usr/bin/tracker-status
-debian/tmp/usr/bin/tracker-tag
diff --git a/debian/tracker.install b/debian/tracker.install
deleted file mode 100644
index d2f9065..0000000
--- a/debian/tracker.install
+++ /dev/null
@@ -1,19 +0,0 @@
-debian/tmp/usr/share/dbus-1/services/
-debian/tmp/usr/share/tracker/*.xml
-debian/tmp/usr/share/tracker/*.sql
-debian/tmp/usr/share/tracker/languages/
-debian/tmp/usr/share/tracker/miners/
-debian/tmp/usr/share/tracker/ontologies/
-debian/tmp/usr/lib/tracker-0.7/*.so.*
-debian/tmp/usr/lib/tracker-0.7/*.so
-debian/tmp/usr/bin/tracker-control
-debian/tmp/usr/lib/tracker/tracker-store
-debian/tmp/usr/lib/tracker/tracker-miner-fs
-debian/tmp/usr/lib/tracker/tracker-extract
-debian/tmp/usr/lib/tracker-0.7/extract-modules/*.so
-debian/tmp/usr/lib/tracker-0.7/extract-modules/*.so*
-debian/tmp/etc/xdg/autostart/tracker-miner-fs.desktop
-debian/tmp/etc/xdg/autostart/tracker-miner-fs.desktop usr/share/autostart/
-debian/tracker.sh etc/osso-af-init
-debian/tracker-cud.sh etc/osso-cud-scripts
-debian/23tracker etc/X11/Xsession.post/
diff --git a/debian/tracker-cud.sh b/debian/tracker07-cud.sh
similarity index 100%
rename from debian/tracker-cud.sh
rename to debian/tracker07-cud.sh
diff --git a/debian/tracker.sh b/debian/tracker07.sh
similarity index 95%
rename from debian/tracker.sh
rename to debian/tracker07.sh
index 4071775..d5d20ed 100755
--- a/debian/tracker.sh
+++ b/debian/tracker07.sh
@@ -3,7 +3,7 @@
# Init script for Tracker
#
-DAEMON=/usr/lib/tracker/tracker-miner-fs
+DAEMON=/usr/lib/tracker-0.7/tracker-miner-fs
NAME=tracker-miner-fs
DESC=Tracker
OPTIONS="-v 1"
--
1.5.6.1