Hi all,
after having used tracker for some days now, I decided that it would
be a valuable addition to Debian and I'm going to package and maintain
it as a Debian Developer. As you probably know, we are currently
nearing the etch release, and the full freeze for etch is coming soon.
So I can't promise that tracker will make it into etch as the upload
to the archive has to be approved by our ftp-masters.
That aside, I've taken a cursory look at the package and found some
issues. The most important one is, that the debian/ directory should
not be shipped in the Debian tarball. I prepared a couple of patches,
which contain a comment at the beginning of each file. So I won't
repeat them here. They are mostly fixes to make "make distcheck" work,
which obviously should always be run before making new release.
Please review and apply.
Issue I noticed that are not addressed by the patches:
1.) Missing copyright statements.
There are a bunch of *.c and *.h files which are missing a copyright
and license statement. Mostly in src/libstemmer/, and e.g.
tracker-db-sqlite.c. Please add a copyright statement including an
email address where appropriate. Best would be if the
license/copyright header would be somewhat consistent among the files.
Can you also please tell me the author of the sqlite code.
2.) Usage of INCLUDES in Makefile.am.
The usage of INCLUDES is not encouraged anymore [1]. Preprocessor
flags like -I or -D should be specified using AM_CPPFLAGS, compiler
flags like -Wall should be specified using AM_CFLAGS, and linker flags
like -static should be set using AM_LDFLAGS.
The Makefile.amS should be cleaned up in that regard.
3.) library versioning
It seems as 3rd party apps start using tracker. I dunno if 3rd party
apps are supposed to only use the D-Bus interface or directly link
against libtrackerclient. If the latter, it would make sense to
consider to use libtools library versioning, given that the API has
reached a
somewhat stable state already. Please read [2] for more information or
ask if you need more information.
Besides the more technical issues mentioned above, I also would like
to know more about the considerations to move the project over to
gnome.org. Having it hosted on fd.o (preferably using git as SCM)
would underline that tracker is a desktop agnostic technology and make
it more attractive to 3rd party developers, like e.g. KDE devs.
That's just my 2ยข though.
Cheers,
Michael
[1] http://sources.redhat.com/automake/automake.html ,
8.7 Variables used when building a program
[2] http://sourceware.org/autobook/autobook/autobook_91.html
From 0e4cf2e0dfeaefd6926fc2d883ef6c7ec2b82bf6 Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:03:31 +0100
Subject: [PATCH] Do not ship debian files.
Remove the debian/ directory and update Makefile.am accordingly. The debian
build files are best handled by the Debian maintainer directly.
---
Makefile.am | 34 +-----
debian/changelog | 23 ---
debian/compat | 1 -
debian/control | 84 ------------
debian/copyright | 26 ----
debian/libtrackerclient0-dev.docs | 2 -
debian/libtrackerclient0-dev.install | 5 -
debian/libtrackerclient0-dev.linda-overrides | 1 -
debian/libtrackerclient0-dev.links | 1 -
debian/libtrackerclient0.docs | 2 -
debian/libtrackerclient0.install | 3 -
debian/libtrackerclient0.linda-overrides | 1 -
debian/libtrackerclient0.links | 1 -
debian/rules | 157 ----------------------
debian/tracker-data.docs | 2 -
debian/tracker-data.install | 4 -
debian/tracker-data.linda-overrides | 1 -
debian/tracker-gnome-search-tool.docs | 2 -
debian/tracker-gnome-search-tool.install | 3 -
debian/tracker-gnome-search-tool.linda-overrides | 1 -
debian/tracker-utils.docs | 2 -
debian/tracker-utils.examples | 1 -
debian/tracker-utils.install | 7 -
debian/tracker-utils.linda-overrides | 1 -
debian/tracker-utils.manpages | 5 -
debian/tracker.docs | 2 -
debian/tracker.install | 6 -
debian/tracker.manpages | 2 -
28 files changed, 2 insertions(+), 378 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a9e4551..550275a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,35 +5,6 @@ xdgconfigdir = $(sysconfdir)/xdg/autostart
pkgconfig_DATA = tracker.pc
xdgconfig_DATA = trackerd.desktop
-debian_files = \
- debian/changelog \
- debian/compat \
- debian/control \
- debian/copyright \
- debian/libtrackerclient0-dev.docs \
- debian/libtrackerclient0-dev.install \
- debian/libtrackerclient0-dev.links \
- debian/libtrackerclient0-dev.linda-overrides \
- debian/libtrackerclient0.docs \
- debian/libtrackerclient0.install \
- debian/libtrackerclient0.links \
- debian/libtrackerclient0.linda-overrides \
- debian/tracker-data.docs \
- debian/tracker-data.install \
- debian/tracker-data.linda-overrides \
- debian/tracker.docs \
- debian/tracker.install \
- debian/tracker.manpages \
- debian/tracker-utils.docs \
- debian/tracker-utils.examples \
- debian/tracker-utils.install \
- debian/tracker-utils.linda-overrides \
- debian/tracker-utils.manpages \
- debian/tracker-gnome-search-tool.install \
- debian/tracker-gnome-search-tool.docs \
- debian/tracker-gnome-search-tool.linda-overrides \
- debian/rules
-
EXTRA_DIST = \
$(pkgconfig_DATA) \
$(xdgconfig_DATA) \
@@ -43,10 +14,9 @@ EXTRA_DIST = \
rdf-query-examples/*.rdf \
intltool-extract.in \
intltool-merge.in \
- intltool-update.in \
- $(debian_files)
+ intltool-update.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
- intltool-update
\ No newline at end of file
+ intltool-update
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index a6be171..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,23 +0,0 @@
-tracker (0.5.2) unstable; urgency=low
-
- * New upstream release.
-
- -- Jamie McCracken <[EMAIL PROTECTED]> Mon, 20 Nov 2006 12:51:22 +0100
-
-tracker (0.5.1) unstable; urgency=low
-
- * New upstream release.
-
- -- Jamie McCracken <[EMAIL PROTECTED]> Mon, 6 Nov 2006 23:57:21 +0100
-
-tracker (0.5.0) unstable; urgency=low
-
- * New upstream release.
-
- -- Jamie McCracken <[EMAIL PROTECTED]> Wed, 21 Oct 2006 04:12:37 +0100
-
-tracker (0.0.4) unstable; urgency=low
-
- * Initial Release.
-
- -- Jamie McCracken <[EMAIL PROTECTED]> Mon, 15 May 2006 11:50:43 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100644
index f92f28a..0000000
--- a/debian/control
+++ /dev/null
@@ -1,84 +0,0 @@
-Source: tracker
-Section: utils
-Priority: optional
-Maintainer: Jamie McCracken <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, intltool (>= 0.21), libpopt-dev, libglib2.0-dev (>= 2.10.0-1), libdbus-1-dev (>= 0.94), libdbus-glib-1-dev (>= 0.71), libgstreamer0.10-dev, libpoppler-dev (>= 0.4.5), libpoppler-glib-dev (>= 0.4.5), libgmime-2.0-2-dev (>= 2.2.0), libxmu-dev, libgtk2.0-dev (>= 2.6.0), libgnome-desktop-dev (>= 2.9.91), gnome-pkg-tools, libgnome2-dev (>= 2.6.1-2)
-Standards-Version: 3.7.2
-
-Package: tracker
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tracker-data (= ${source:Version})
-Recommends: tracker-utils
-Description: Metadata database and indexing search tool
- Tracker is an advanced framework for first class objects with associated
- metadata and tags. It provides a one stop solution for all metadata, tags,
- shared object databases, search tools and indexing.
-
-Package: tracker-data
-Architecture: all
-Description: Metadata database and indexing search tool
- This package ships architecture independent data for Tracker like translations
- or icons.
- .
- Tracker is an advanced framework for first class objects with associated
- metadata and tags. It provides a one stop solution for all metadata, tags,
- shared object databases, search tools and indexing.
-
-Package: libtrackerclient0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, tracker (= ${Source-Version})
-Description: Library for accessing Tracker
- This library allow programmers accessing Tracker daemon and performing
- searches.
- .
- Tracker is an advanced framework for first class objects with associated
- metadata and tags. It provides a one stop solution for all metadata, tags,
- shared object databases, search tools and indexing.
-
-Package: libtrackerclient0-dev
-Architecture: any
-Section: devel
-Depends: libtrackerclient0 (= ${Source-Version})
-Description: Development files for Tracker
- This package contains the headers and other development files not included in
- the libtrackerclient0 package for developing with it.
- .
- Tracker is an advanced framework for first class objects with associated
- metadata and tags. It provides a one stop solution for all metadata, tags,
- shared object databases, search tools and indexing.
-
-Package: tracker-utils
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Utilities for Tracker
- Included utilities for Tracker:
- * tracker-files: get files based on a ServiceType (Documents, Music, Images,
- Videos, Text, Development, Other), or on specified mime types.
- * tracker-meta-folder: get metadata for files in a folder.
- * tracker-query: this reads from STDIN an RDF Query that specifies the search
- criteria for various fields. It prints to STDOUT all matching files. Some
- examples are included in this package.
- * tracker-search: this perfoms a google like search using SEARCHTERM to
- retrieve all matching files where SEARCHTERM appears in any searchable
- metadata.
- * tracker-stats: retreive some statistics.
- * tracker-tag: tool to manage tags on files.
- .
- Tracker is an advanced framework for first class objects with associated
- metadata and tags. It provides a one stop solution for all metadata, tags,
- shared object databases, search tools and indexing.
-
-Package: tracker-gnome-search-tool
-Priority: optional
-Section: gnome
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Tracker search tool for GNOME
- This package provides a graphical Tracker search tool dedicated to GNOME,
- the "GNU Network Object Model Environment".
- .
- Tracker is an advanced framework for first class objects with associated
- metadata and tags. It provides a one stop solution for all metadata, tags,
- shared object databases, search tools and indexing.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index c3537e6..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,26 +0,0 @@
-This is tracker, written and maintained by Jamie McCracken <[EMAIL PROTECTED]>
-on Mon, 15 May 2006 11:50:43 +0100.
-
-The original source can always be found at:
- http:/www.gnome.org/~jamiemcc/tracker
-
-Copyright (C) 2005 jamie
-
-License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/libtrackerclient0-dev.docs b/debian/libtrackerclient0-dev.docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/libtrackerclient0-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/libtrackerclient0-dev.install b/debian/libtrackerclient0-dev.install
deleted file mode 100644
index 82a8071..0000000
--- a/debian/libtrackerclient0-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/
-debian/tmp/usr/lib/libtrackerclient.{so,a,la}
-debian/tmp/usr/lib/libtracker.so
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/share/linda/overrides/libtrackerclient0-dev
diff --git a/debian/libtrackerclient0-dev.linda-overrides b/debian/libtrackerclient0-dev.linda-overrides
deleted file mode 100644
index 4621093..0000000
--- a/debian/libtrackerclient0-dev.linda-overrides
+++ /dev/null
@@ -1 +0,0 @@
-Tag: wrong-changelog-name
diff --git a/debian/libtrackerclient0-dev.links b/debian/libtrackerclient0-dev.links
deleted file mode 100644
index 511f764..0000000
--- a/debian/libtrackerclient0-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libtrackerclient.so usr/lib/libtracker.so
diff --git a/debian/libtrackerclient0.docs b/debian/libtrackerclient0.docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/libtrackerclient0.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/libtrackerclient0.install b/debian/libtrackerclient0.install
deleted file mode 100644
index 69270a4..0000000
--- a/debian/libtrackerclient0.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libtrackerclient.so.*
-debian/tmp/usr/lib/libtracker.so.*
-debian/tmp/usr/share/linda/overrides/libtrackerclient0
diff --git a/debian/libtrackerclient0.linda-overrides b/debian/libtrackerclient0.linda-overrides
deleted file mode 100644
index 4621093..0000000
--- a/debian/libtrackerclient0.linda-overrides
+++ /dev/null
@@ -1 +0,0 @@
-Tag: wrong-changelog-name
diff --git a/debian/libtrackerclient0.links b/debian/libtrackerclient0.links
deleted file mode 100644
index e928890..0000000
--- a/debian/libtrackerclient0.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libtrackerclient.so.0 usr/lib/libtracker.so.0
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 2c57a92..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# Ensure the build aborts when there are still references to undefined
-# symbols.
-LDFLAGS += -Wl,-z,defs
-
-# Only link shared libraries that have used symbols
-LDFLAGS += Wl,--as-needed
-
-# Get package version from the changelog
-package_version=$(shell head -n 1 $(CURDIR)/debian/changelog | sed \
- -e 's/^tracker (\([[:digit:]]\+.*\))[[:space:]]\+\w\+;[[:space:]]\+\w\+=\w\+/\1/')
-
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
-
- # To avoid implicit parameter -Wl,--rpath
- # It is necessary for "old" automake versions since "--disable-rpath" is not handle in configure
- sed < libtool > libtool-2 \
- -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
- -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' \
- -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/'
- mv libtool-2 libtool
- chmod 755 libtool
-
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/tracker.sgml > tracker.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
-
- -rm -rf $(BUILD_DEB_DIR)
- -rm -rf $(BUILD_UDEB_DIR)
- -rm -rf $(STAMP_DIR)
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
-
- # Install .desktop files
- mkdir -p $(CURDIR)/debian/tmp/etc/xdg/autostart/
- mkdir -p $(CURDIR)/debian/tmp/usr/share/autostart/
- install -c -m 444 $(CURDIR)/trackerd.desktop $(CURDIR)/debian/tmp/etc/xdg/autostart/
- install -c -m 444 $(CURDIR)/trackerd-kde.desktop $(CURDIR)/debian/tmp/usr/share/autostart/
-
- # Install linda overrides file
- install -c -D -m 444 $(CURDIR)/debian/tracker-data.linda-overrides $(CURDIR)/debian/tmp/usr/share/linda/overrides/tracker-data
-
- dh_install -i
-
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
-
- # Install linda overrides file
- install -c -D -m 444 $(CURDIR)/debian/libtrackerclient0.linda-overrides $(CURDIR)/debian/tmp/usr/share/linda/overrides/libtrackerclient0
- install -c -D -m 444 $(CURDIR)/debian/libtrackerclient0-dev.linda-overrides $(CURDIR)/debian/tmp/usr/share/linda/overrides/libtrackerclient0-dev
- install -c -D -m 444 $(CURDIR)/debian/tracker-utils.linda-overrides $(CURDIR)/debian/tmp/usr/share/linda/overrides/tracker-utils
- install -c -D -m 444 $(CURDIR)/debian/tracker-gnome-search-tool.linda-overrides $(CURDIR)/debian/tmp/usr/share/linda/overrides/tracker-gnome-search-tool
-
- dh_install -a
-
- dh_installdocs -a
- dh_installchangelogs -a ChangeLog
- dh_installexamples -a
- dh_installman -a
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
-
- # Turn dependencies to libtrackerclient0 into dependencies to something like libtrackerclient0 (= 0.5.0)
- for f in $(CURDIR)/debian/*.substvars; do \
- sed -e "s/libtrackerclient0[^,]*/libtrackerclient0 (= $(package_version))/g" $$f > $$f-2; \
- mv $$f-2 $$f; \
- done
-
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/tracker-data.docs b/debian/tracker-data.docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/tracker-data.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/tracker-data.install b/debian/tracker-data.install
deleted file mode 100644
index 75cfebe..0000000
--- a/debian/tracker-data.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/etc/xdg/autostart/trackerd.desktop
-debian/tmp/usr/share/autostart/trackerd-kde.desktop
-debian/tmp/usr/share/locale/
-debian/tmp/usr/share/linda/overrides/tracker-data
diff --git a/debian/tracker-data.linda-overrides b/debian/tracker-data.linda-overrides
deleted file mode 100644
index 4621093..0000000
--- a/debian/tracker-data.linda-overrides
+++ /dev/null
@@ -1 +0,0 @@
-Tag: wrong-changelog-name
diff --git a/debian/tracker-gnome-search-tool.docs b/debian/tracker-gnome-search-tool.docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/tracker-gnome-search-tool.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/tracker-gnome-search-tool.install b/debian/tracker-gnome-search-tool.install
deleted file mode 100644
index 1bde605..0000000
--- a/debian/tracker-gnome-search-tool.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/bin/tracker-search-tool
-debian/tmp/usr/share/pixmaps/tracker/
-debian/tmp/usr/share/linda/overrides/tracker-gnome-search-tool
diff --git a/debian/tracker-gnome-search-tool.linda-overrides b/debian/tracker-gnome-search-tool.linda-overrides
deleted file mode 100644
index 4621093..0000000
--- a/debian/tracker-gnome-search-tool.linda-overrides
+++ /dev/null
@@ -1 +0,0 @@
-Tag: wrong-changelog-name
diff --git a/debian/tracker-utils.docs b/debian/tracker-utils.docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/tracker-utils.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/tracker-utils.examples b/debian/tracker-utils.examples
deleted file mode 100644
index ff42281..0000000
--- a/debian/tracker-utils.examples
+++ /dev/null
@@ -1 +0,0 @@
-rdf-query-examples/*.rdf
diff --git a/debian/tracker-utils.install b/debian/tracker-utils.install
deleted file mode 100644
index 232a61e..0000000
--- a/debian/tracker-utils.install
+++ /dev/null
@@ -1,7 +0,0 @@
-debian/tmp/usr/bin/tracker-files
-debian/tmp/usr/bin/tracker-meta-folder
-debian/tmp/usr/bin/tracker-query
-debian/tmp/usr/bin/tracker-search
-debian/tmp/usr/bin/tracker-stats
-debian/tmp/usr/bin/tracker-tag
-debian/tmp/usr/share/linda/overrides/tracker-utils
diff --git a/debian/tracker-utils.linda-overrides b/debian/tracker-utils.linda-overrides
deleted file mode 100644
index 4621093..0000000
--- a/debian/tracker-utils.linda-overrides
+++ /dev/null
@@ -1 +0,0 @@
-Tag: wrong-changelog-name
diff --git a/debian/tracker-utils.manpages b/debian/tracker-utils.manpages
deleted file mode 100644
index 2c33e47..0000000
--- a/debian/tracker-utils.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/share/man/man1/tracker-files.1
-debian/tmp/usr/share/man/man1/tracker-meta-folder.1
-debian/tmp/usr/share/man/man1/tracker-query.1
-debian/tmp/usr/share/man/man1/tracker-search.1
-debian/tmp/usr/share/man/man1/tracker-stats.1
diff --git a/debian/tracker.docs b/debian/tracker.docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/tracker.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/tracker.install b/debian/tracker.install
deleted file mode 100644
index 03b2fa2..0000000
--- a/debian/tracker.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/usr/bin/htmless
-debian/tmp/usr/bin/o3totxt
-debian/tmp/usr/bin/tracker-extract
-debian/tmp/usr/bin/trackerd
-debian/tmp/usr/share/tracker/
-debian/tmp/usr/share/dbus-1/services/
diff --git a/debian/tracker.manpages b/debian/tracker.manpages
deleted file mode 100644
index 9c0d8db..0000000
--- a/debian/tracker.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man1/trackerd.1
-debian/tmp/usr/share/man/man1/tracker-extract.1
--
1.4.4.1
From eb75de1917c5a3fc0c68b87cf20d2ea1e748ed9e Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:06:06 +0100
Subject: [PATCH] USE AC_HELP_STRING
Make use of AC_HELP_STRING to properly format the output of ./configure
---
configure.in | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index c9546e8..bc43cfc 100644
--- a/configure.in
+++ b/configure.in
@@ -290,8 +290,9 @@ if test "x$enable_file_monitoring" = "xauto"; then
else
inotify_header="sys/inotify.h"
fi
- AC_ARG_ENABLE(debug, [ --enable-inotify-debug turn on inotify debugging],
- [AC_DEFINE(LIBINOTIFY_DEBUG,, [is debugging enabled?])],)
+ AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-inotify-debug], [turn on inotify debugging]),
+ [AC_DEFINE(LIBINOTIFY_DEBUG,, [is debugging enabled?])],)
elif test "$fam_support" = "yes"; then
if test "$fam_type" = "gamin"; then
primary_backend="gamin"
--
1.4.4.1
From fdf74b04d567f3f38c6380f9194677eca23ef290 Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:11:24 +0100
Subject: [PATCH] List all files in rdf-query-examples
Specify the files in rdf-query-examples explicitely, not by wild card,
because that breaks "make dist" for builddir != srcdir
---
Makefile.am | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 550275a..5303249 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,11 @@ EXTRA_DIST = \
AUTHORS NEWS INSTALL COPYING README \
ChangeLog \
configure.in \
- rdf-query-examples/*.rdf \
+ rdf-query-examples/80s-music.rdf \
+ rdf-query-examples/90s-music.rdf \
+ rdf-query-examples/all-documents.rdf \
+ rdf-query-examples/big-documents.rdf \
+ rdf-query-examples/wallpapers.rdf \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
--
1.4.4.1
From eaf56a1cd82c0a02add74047028374a9c5a9d237 Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:16:10 +0100
Subject: [PATCH] remove wrong dist_subdirs line
AM_CONDITIONAL already cares for setting DIST_SUBDIRS correctly, so there
is no need to specify DIST_SUBDIRS explicitely. The current DIST_SUBDIRS
line is actually broken and made "make dist" fail. So removing it.
---
src/Makefile.am | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 16f1598..f78b13e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,10 @@
-
-
if HAVE_GNOME
tracker_gui_dir = tracker-search-tool
-else
-tracker_gui_dir =
endif
-if USING_EXTERNAL_SQLITE
-sqlite_dir =
-else
+if !USING_EXTERNAL_SQLITE
sqlite_dir = sqlite3
endif
SUBDIRS = libstemmer $(sqlite_dir) text-filters trackerd libtracker tracker-extract $(tracker_gui_dir)
-DIST_SUBDIRS = libstemmer $(sqlite_dir) text-filters trackerd libtracker tracker-extract $(tracker_gui_dir)
--
1.4.4.1
From 8984f4d2c07571d52cf9107aa2a0882f08353d03 Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:25:17 +0100
Subject: [PATCH] Clean generated files
Clean autogenerated files, needed for "make distcheck"
---
data/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 1808446..6dfbd47 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,6 +13,7 @@ servicedir = $(prefix)/share/dbus-1/services
service_in_files = tracker.service.in
service_DATA = tracker.service
+CLEANFILES = $(service_DATA)
EXTRA_DIST = $(config_DATA) $(service_in_files)
%.service: %.service.in
--
1.4.4.1
From cd454ef47551d6ee7f93b328dc5cc3203e26175b Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:29:52 +0100
Subject: [PATCH] Don't ship generated files.
tracker.pc is generated from tracker.pc.in and shouldn't be shipped in the
tarball. Removing it from EXTRA_DIST
---
Makefile.am | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5303249..565d32a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ pkgconfig_DATA = tracker.pc
xdgconfig_DATA = trackerd.desktop
EXTRA_DIST = \
- $(pkgconfig_DATA) \
$(xdgconfig_DATA) \
AUTHORS NEWS INSTALL COPYING README \
ChangeLog \
--
1.4.4.1
From 10334ef42fbef4bc7e4b375d9fca3106f7818b0a Mon Sep 17 00:00:00 2001
From: Michael Biebl <[EMAIL PROTECTED]>
Date: Tue, 28 Nov 2006 17:39:08 +0100
Subject: [PATCH] Don't create compat symlinks
Remove the compat symlinks libtracker -> libtrackerclient
---
src/libtracker/Makefile.am | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/libtracker/Makefile.am b/src/libtracker/Makefile.am
index 6f327f1..4d7c21a 100644
--- a/src/libtracker/Makefile.am
+++ b/src/libtracker/Makefile.am
@@ -56,7 +56,3 @@ tracker_files_LDADD = $(GLIB2_LIBS) \
$(DBUS_LIBS) \
$(GOBJECT_LIBS) \
$(top_builddir)/src/libtracker/libtrackerclient.la
-
-install-exec-hook:
- cd $(DESTDIR)/$(libdir) && rm -f libtracker.so && ln -s libtrackerclient.so libtracker.so
- cd $(DESTDIR)/$(libdir) && rm -f libtracker.so.0 && ln -s libtrackerclient.so.0 libtracker.so.0
--
1.4.4.1
_______________________________________________
tracker-list mailing list
tracker-list@gnome.org
http://mail.gnome.org/mailman/listinfo/tracker-list
