[Pkg-telepathy-commits] [folks] 06/15: git-files.patch: add some missing files from upstream git so we can apply patches that touch them
Simon McVittie
smcv at debian.org
Thu Mar 27 20:11:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch telepathy1
in repository folks.
commit b0578d754b552010a15e7c094df1cf04b9660a34
Author: Simon McVittie <smcv at debian.org>
Date: Wed Mar 26 11:32:03 2014 +0000
git-files.patch: add some missing files from upstream git so we can apply patches that touch them
---
debian/changelog | 7 +
debian/patches/git-files.patch | 596 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 604 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9019caa..75411f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+folks (0.9.6-2tp1.1) UNRELEASED; urgency=medium
+
+ * git-files.patch: add some missing files from upstream git so we can
+ apply patches that touch them
+
+ -- Simon McVittie <smcv at debian.org> Wed, 26 Mar 2014 17:53:22 +0000
+
folks (0.9.6-2) unstable; urgency=low
* Team upload
diff --git a/debian/patches/git-files.patch b/debian/patches/git-files.patch
new file mode 100644
index 0000000..988065a
--- /dev/null
+++ b/debian/patches/git-files.patch
@@ -0,0 +1,596 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Wed, 26 Mar 2014 11:25:05 +0000
+Subject: Copy in extraneous files from upstream git so we can apply patches
+ cleanly
+
+---
+ HACKING | 196 +++++++++++++++++++++++++++++++++++++++
+ folks.doap | 49 ++++++++++
+ git.mk | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 551 insertions(+)
+ create mode 100644 HACKING
+ create mode 100644 folks.doap
+ create mode 100644 git.mk
+
+diff --git a/HACKING b/HACKING
+new file mode 100644
+index 0000000..b2f57ab
+--- /dev/null
++++ b/HACKING
+@@ -0,0 +1,196 @@
++This file is meant to summarize the Folks development policies.
++
++Code merging
++============
++
++This is the work flow for modifying the master repository:
++
++1. File a bug for the given flaw or feature (if it does not already exist) at
++ <https://bugzilla.gnome.org/enter_bug.cgi?product=folks>.
++
++2. Clone the main repository (if you haven't already) and start work in a new
++ branch (which preferably includes the bug number in its name).
++
++3. If this is a non-trivial flaw or feature, write test cases. We won't accept
++ significant changes without adequate test coverage.
++
++4. Write code to fix the flaw or add the feature. In the case that tests are
++ necessary, the new tests must pass consistently.
++
++5. All code must follow the project coding style (see below).
++
++6. The project must remain buildable with all configure options and pass all
++ tests on all platforms.
++
++7. Push your branch to a public repository and attach patch(es) to the bug. Ask
++ for a review.
++
++8. Rework your code based on suggestions in the review and submit new patches.
++ Return to the review step as necessary.
++
++9. Upon approval, pull the latest master branch, rebase your branch upon it, and
++ push the resulting branch to master. Simple!
++
++Clean commits
++=============
++
++Commits/patches should be as fine-grained as possible (and no finer). Every
++distinct change should be in its own commit and every commit should be a
++meaningful change on its own.
++
++As much as possible, the full tree should be buildable and pass all tests at
++every commit. There are exceptions, but they're rare. And, of course, it's more
++critical that the master branch be buildable (and all tests pass) after every
++merge.
++
++Coding style
++============
++
++In general, Folks follows the Telepathy-GLib coding style described in
++<http://telepathy.freedesktop.org/wiki/Style>.
++
++Additional general rules
++------------------------
++
++1. All public symbols which support a Valadoc comment block must have one. This
++ comment block must also be sufficient for gobject-introspection to adequately
++ introspect the symbol for use in other programming languages.
++
++2. Include a @since statement in the comment block for new symbols.
++
++Vala-specific rules
++-------------------
++
++1. Any functions which could block must be async.
++
++2. Use the language-native Errors for error reporting, not return values.
++
++3. Take advantage of properties and their automatic notify signals as much as
++ possible (this eliminates the need for most special accessors, mutators, and
++ custom signals and is more conventional).
++
++4. Class function blocks should be indented like GNU/Telepathy-GLib if/while
++ blocks. It's arguable that these should be aligned in column 0, as in regular
++ C functions, but it's too late to change this (as it would make 'git blame'
++ useless).
++
++5. Private and internal class data members should beging with a _ (public data
++ members and local variables should not begin with a _). This is to make
++ non-public data members instantly recognizable as such (which helps
++ readability).
++
++6. Private and internal class functions should begin with a _ (public functions
++ should not begin with a _). This is to make non-public functions instantly
++ recognizable as such (which helps readability).
++
++7. Maximize use of the 'var' variable type. This shortens the declarations where
++ it's valid, reducing noise.
++
++ Rarely, the use of 'var' can obscure the effective type of the variable. In
++ this case, it's acceptable to provide an explicit type.
++
++8. Use the 'unowned' modifier when it would prevent a non-trivial amount of
++ memory allocation. This is most commonly true for strings, arrays, and
++ non-reference-counted variables.
++
++ Do not use 'unowned' for reference-counted variables (like objects) since it
++ reduces readability without benefit. And, as of this writing, bgo#638199
++ forces unowned variables to have an explicit type (preventing the use of
++ 'var').
++
++9. As in most languages, avoid casting. Casting is usually a sign of an error
++ which should be fixed and reduces readability.
++
++10. Refer to non-local variables and methods with their qualified name. Within a
++ class function, refer to private data members like 'this._foo' and foreign
++ package symbols like 'package_name.symbol'.
++
++ This makes scope immediately clear, helping readability.
++
++11. Use nullable types correctly. This helps readability (and makes the
++ programmer's intentions clearer about whether a variable may be null). The
++ ultimate goal is for folks to compile correctly with Vala’s strict-non-null
++ mode enabled (https://live.gnome.org/Vala/Tutorial#Strict_Non-Null_Mode).
++ You can compile folks with strict-non-null mode enabled using:
++ make VALAFLAGS=--enable-experimental-non-null
++
++12. Place the (private) member variable declaration for a variable which backs a
++ property next to the (public) property declaration, rather than at the top
++ of the file. This keeps as much of the code pertaining to a property as
++ possible in one location.
++
++13. Initialise member variables when declaring them, if possible, rather than in
++ a constructor or construct{} block. If it’s not possible to initialise a
++ member variable at declaration time (e.g. because its value depends on
++ another variable), perform the initialisation in a construct{} block rather
++ than a specific constructor. This means that the initialisation doesn’t have
++ to be copied between multiple alternate constructors.
++
++14. When iterating over a MultiMap, try to use the map_iterator().
++ This is more efficient than iterating over the result of get_keys(),
++ then calling get() separately for each key.
++
++Build health
++============
++
++1. Before pushing commits to the mainline branch, the final commit in the
++ series must successfully build and pass 'make check' consistently.
++
++2. After commits have been pushed to mainline, all buildbots must successfully
++ build and pass 'make check' on their next build of Folks. It's up to the
++ committer to ensure this requirement is met and make necessary changes.
++
++Debugging tests
++===============
++
++If a test ever crashes, you'll probably want to run it through gdb. The exact
++setup work for that is a bit complicated, so we've provided some convenience
++hooks for each test. Simply run:
++
++ make -C tests/<dir> <test name>.gdb
++
++Then use gdb as normal.
++
++To run a single test:
++ make -C tests/<dir> check TESTS=<test name>
++
++To run a single test with debugging output:
++ make -C tests/<dir> check TESTS=<test name> CHECK_VERBOSE=1
++
++If a test needs to be run through Valgrind for memory debugging, use:
++ make -C tests/<dir> check TESTS=<test name> FOLKS_TEST_VALGRIND=1
++
++If a test needs to be run through Callgrind for performance profiling, use:
++ make -C tests/<dir> check TESTS=<test name> FOLKS_TEST_CALLGRIND=1
++
++Profiling folks
++===============
++
++Folks has various profiling points throughout its startup code, in order to be
++able to profile the startup process. In order to use this:
++ 1. Compile folks with --enable-profiling.
++ 2. strace -ttt -f -o /tmp/logfile folks-inspect # or some other folks program
++ 3. python plot-timeline.py -o output.png /tmp/logfile
++ 4. Examine output.png for obvious problems
++
++This is based on Federico Mena Quintero’s plot-timeline.py, described on:
++http://people.gnome.org/~federico/news-2006-03.html#timeline-tools. The Python
++script itself can be downloaded from
++http://gitorious.org/projects/performance-scripts.
++
++Environment variables
++=====================
++
++FOLKS_BACKEND_STORE_KEY_FILE_PATH sets the keyfile used to control the set
++of enabled backends. The default is g_get_user_data_dir()/folks/backends.ini,
++and if it is empty, all backends are enabled.
++
++If FOLKS_BACKENDS_ALLOWED is set, it's a space-, comma- or
++colon-separated list of backends to allow, or "all". If unset, the
++default is equivalent to "all". Backends not in the list are disallowed,
++even if enabled in the keyfile or with enable_backend().
++
++If FOLKS_BACKENDS_DISABLED is set, it's a space-, comma- or
++colon-separated list of backends to disallow, or "all". If unset, the
++default is equivalent to "all". Backends in the list are disallowed,
++even if enabled in the keyfile or with enable_backend().
+diff --git a/folks.doap b/folks.doap
+new file mode 100644
+index 0000000..f422fba
+--- /dev/null
++++ b/folks.doap
+@@ -0,0 +1,49 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:foaf="http://xmlns.com/foaf/0.1/"
++ xmlns:gnome="http://api.gnome.org/doap-extensions#"
++ xmlns="http://usefulinc.com/ns/doap#">
++
++ <name xml:lang="en">Folks</name>
++ <shortdesc xml:lang="en">People aggregation library</shortdesc>
++ <description>Folks is a contact aggregation library. It retrieves contacts
++ from various sources (including Telepathy IM accounts, libsocialweb web
++ service contacts, and local contact stores) and compiles them into
++ fully-fledged people objects. The ultimate goal is to provide the platform
++ with easy access to all of the user's contacts.</description>
++ <homepage rdf:resource="https://live.gnome.org/Folks" />
++ <download-page rdf:resource="http://download.gnome.org/sources/folks/" />
++ <bug-database
++ rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=folks" />
++ <mailing-list rdf:resource="http://lists.freedesktop.org/mailman/listinfo/telepathy" />
++
++ <maintainer>
++ <foaf:Person>
++ <foaf:name>Travis Reitter</foaf:name>
++ <foaf:mbox rdf:resource="mailto:travis.reitter at collabora.co.uk" />
++ <gnome:userid>treitter</gnome:userid>
++ </foaf:Person>
++ </maintainer>
++ <maintainer>
++ <foaf:Person>
++ <foaf:name>Philip Withnall</foaf:name>
++ <foaf:mbox rdf:resource="mailto:philip.withnall at collabora.co.uk" />
++ <gnome:userid>pwithnall</gnome:userid>
++ </foaf:Person>
++ </maintainer>
++ <maintainer>
++ <foaf:Person>
++ <foaf:name>Raul Gutierrez Segales</foaf:name>
++ <foaf:mbox rdf:resource="mailto:rgs at collabora.co.uk" />
++ <gnome:userid>raulgs</gnome:userid>
++ </foaf:Person>
++ </maintainer>
++ <maintainer>
++ <foaf:Person>
++ <foaf:name>Jeremy Whiting</foaf:name>
++ <foaf:mbox rdf:resource="mailto:jpwhiting at kde.org" />
++ <gnome:userid>jpwhiting</gnome:userid>
++ </foaf:Person>
++ </maintainer>
++</Project>
+diff --git a/git.mk b/git.mk
+new file mode 100644
+index 0000000..6f41f1d
+--- /dev/null
++++ b/git.mk
+@@ -0,0 +1,306 @@
++# git.mk
++#
++# Copyright 2009, Red Hat, Inc.
++# Copyright 2010,2011,2012,2013 Behdad Esfahbod
++# Written by Behdad Esfahbod
++#
++# Copying and distribution of this file, with or without modification,
++# is permitted in any medium without royalty provided the copyright
++# notice and this notice are preserved.
++#
++# The latest version of this file can be downloaded from:
++# https://raw.github.com/behdad/git.mk/master/git.mk
++# Bugs, etc, should be reported upstream at:
++# https://github.com/behdad/git.mk
++#
++# To use in your project, import this file in your git repo's toplevel,
++# then do "make -f git.mk". This modifies all Makefile.am files in
++# your project to -include git.mk. Remember to add that line to new
++# Makefile.am files you create in your project, or just rerun the
++# "make -f git.mk".
++#
++# This enables automatic .gitignore generation. If you need to ignore
++# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
++# But think twice before doing that. If a file has to be in .gitignore,
++# chances are very high that it's a generated file and should be in one
++# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
++#
++# The only case that you need to manually add a file to GITIGNOREFILES is
++# when remove files in one of mostlyclean-local, clean-local, distclean-local,
++# or maintainer-clean-local make targets.
++#
++# Note that for files like editor backup, etc, there are better places to
++# ignore them. See "man gitignore".
++#
++# If "make maintainer-clean" removes the files but they are not recognized
++# by this script (that is, if "git status" shows untracked files still), send
++# me the output of "git status" as well as your Makefile.am and Makefile for
++# the directories involved and I'll diagnose.
++#
++# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
++# Makefile.am.sample in the git.mk git repo.
++#
++# Don't EXTRA_DIST this file. It is supposed to only live in git clones,
++# not tarballs. It serves no useful purpose in tarballs and clutters the
++# build dir.
++#
++# This file knows how to handle autoconf, automake, libtool, gtk-doc,
++# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
++#
++# This makefile provides the following targets:
++#
++# - all: "make all" will build all gitignore files.
++# - gitignore: makes all gitignore files in the current dir and subdirs.
++# - .gitignore: make gitignore file for the current dir.
++# - gitignore-recurse: makes all gitignore files in the subdirs.
++#
++# KNOWN ISSUES:
++#
++# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
++# submodule doesn't find us. If you have configure.{in,ac} files in
++# subdirs, add a proxy git.mk file in those dirs that simply does:
++# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste.
++# And add those files to git. See vte/gnome-pty-helper/git.mk for
++# example.
++#
++
++
++
++###############################################################################
++# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
++###############################################################################
++
++#
++# Most autotools-using modules should be fine including this variable in their
++# toplevel MAINTAINERCLEANFILES:
++GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
++ $(srcdir)/aclocal.m4 \
++ $(srcdir)/autoscan.log \
++ $(srcdir)/configure.scan \
++ `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
++ test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
++ for x in \
++ ar-lib \
++ compile \
++ config.guess \
++ config.sub \
++ depcomp \
++ install-sh \
++ ltmain.sh \
++ missing \
++ mkinstalldirs \
++ test-driver \
++ ; do echo "$$AUX_DIR/$$x"; done` \
++ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
++ head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
++#
++# All modules should also be fine including the following variable, which
++# removes automake-generated Makefile.in files:
++GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
++ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
++ while read f; do \
++ case $$f in Makefile|*/Makefile) \
++ test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
++ done`
++#
++# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also
++# include this:
++GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
++ $(srcdir)/m4/libtool.m4 \
++ $(srcdir)/m4/ltoptions.m4 \
++ $(srcdir)/m4/ltsugar.m4 \
++ $(srcdir)/m4/ltversion.m4 \
++ $(srcdir)/m4/lt~obsolete.m4
++
++
++
++###############################################################################
++# Default rule is to install ourselves in all Makefile.am files:
++###############################################################################
++
++git-all: git-mk-install
++
++git-mk-install:
++ @echo "Installing git makefile"
++ @any_failed=; \
++ find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
++ if grep 'include .*/git.mk' $$x >/dev/null; then \
++ echo "$$x already includes git.mk"; \
++ else \
++ failed=; \
++ echo "Updating $$x"; \
++ { cat $$x; \
++ echo ''; \
++ echo '-include $$(top_srcdir)/git.mk'; \
++ } > $$x.tmp || failed=1; \
++ if test x$$failed = x; then \
++ mv $$x.tmp $$x || failed=1; \
++ fi; \
++ if test x$$failed = x; then : else \
++ echo "Failed updating $$x"; >&2 \
++ any_failed=1; \
++ fi; \
++ fi; done; test -z "$$any_failed"
++
++.PHONY: git-all git-mk-install
++
++
++
++###############################################################################
++# Actual .gitignore generation:
++###############################################################################
++
++$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
++ @echo "git.mk: Generating $@"
++ @{ \
++ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
++ for x in \
++ $(DOC_MODULE)-decl-list.txt \
++ $(DOC_MODULE)-decl.txt \
++ tmpl/$(DOC_MODULE)-unused.sgml \
++ "tmpl/*.bak" \
++ xml html \
++ ; do echo "/$$x"; done; \
++ FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
++ case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
++ fi; \
++ if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
++ for lc in $(DOC_LINGUAS); do \
++ for x in \
++ $(if $(DOC_MODULE),$(DOC_MODULE).xml) \
++ $(DOC_PAGES) \
++ $(DOC_INCLUDES) \
++ ; do echo "/$$lc/$$x"; done; \
++ done; \
++ for x in \
++ $(_DOC_OMF_ALL) \
++ $(_DOC_DSK_ALL) \
++ $(_DOC_HTML_ALL) \
++ $(_DOC_MOFILES) \
++ $(DOC_H_FILE) \
++ "*/.xml2po.mo" \
++ "*/*.omf.out" \
++ ; do echo /$$x; done; \
++ fi; \
++ if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
++ for lc in $(HELP_LINGUAS); do \
++ for x in \
++ $(HELP_FILES) \
++ "$$lc.stamp" \
++ "$$lc.mo" \
++ ; do echo "/$$lc/$$x"; done; \
++ done; \
++ fi; \
++ if test "x$(gsettings_SCHEMAS)" = x; then :; else \
++ for x in \
++ $(gsettings_SCHEMAS:.xml=.valid) \
++ $(gsettings__enum_file) \
++ ; do echo "/$$x"; done; \
++ fi; \
++ if test -f $(srcdir)/po/Makefile.in.in; then \
++ for x in \
++ po/Makefile.in.in \
++ po/Makefile.in.in~ \
++ po/Makefile.in \
++ po/Makefile \
++ po/Makevars.template \
++ po/POTFILES \
++ po/Rules-quot \
++ po/stamp-it \
++ po/.intltool-merge-cache \
++ "po/*.gmo" \
++ "po/*.header" \
++ "po/*.mo" \
++ "po/*.sed" \
++ "po/*.sin" \
++ po/$(GETTEXT_PACKAGE).pot \
++ intltool-extract.in \
++ intltool-merge.in \
++ intltool-update.in \
++ ; do echo "/$$x"; done; \
++ fi; \
++ if test -f $(srcdir)/configure; then \
++ for x in \
++ autom4te.cache \
++ configure \
++ config.h \
++ stamp-h1 \
++ libtool \
++ config.lt \
++ ; do echo "/$$x"; done; \
++ fi; \
++ if test "x$(DEJATOOL)" = x; then :; else \
++ for x in \
++ $(DEJATOOL) \
++ ; do echo "/$$x.sum"; echo "/$$x.log"; done; \
++ echo /site.exp; \
++ fi; \
++ if test "x$(am__dirstamp)" = x; then :; else \
++ echo "$(am__dirstamp)"; \
++ fi; \
++ if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
++ for x in \
++ "*.lo" \
++ ".libs" "_libs" \
++ ; do echo "$$x"; done; \
++ fi; \
++ for x in \
++ .gitignore \
++ $(GITIGNOREFILES) \
++ $(CLEANFILES) \
++ $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
++ $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
++ $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
++ so_locations \
++ $(MOSTLYCLEANFILES) \
++ $(TEST_LOGS) \
++ $(TEST_LOGS:.log=.trs) \
++ $(TEST_SUITE_LOG) \
++ "*.$(OBJEXT)" \
++ $(DISTCLEANFILES) \
++ $(am__CONFIG_DISTCLEAN_FILES) \
++ $(CONFIG_CLEAN_FILES) \
++ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
++ "*.tab.c" \
++ $(MAINTAINERCLEANFILES) \
++ $(BUILT_SOURCES) \
++ $(DEPDIR) \
++ $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
++ $(filter %_vala.stamp,$(DIST_COMMON)) \
++ $(filter %.vapi,$(DIST_COMMON)) \
++ $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
++ Makefile \
++ Makefile.in \
++ "*.orig" \
++ "*.rej" \
++ "*.bak" \
++ "*~" \
++ ".*.sw[nop]" \
++ ".dirstamp" \
++ ; do echo "/$$x"; done; \
++ } | \
++ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
++ sed 's@/[.]/@/@g' | \
++ LC_ALL=C sort | uniq > $@.tmp && \
++ mv $@.tmp $@;
++
++all: $(srcdir)/.gitignore gitignore-recurse-maybe
++gitignore: $(srcdir)/.gitignore gitignore-recurse
++
++gitignore-recurse-maybe:
++ @for subdir in $(DIST_SUBDIRS); do \
++ case " $(SUBDIRS) " in \
++ *" $$subdir "*) :;; \
++ *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
++ esac; \
++ done
++gitignore-recurse:
++ @for subdir in $(DIST_SUBDIRS); do \
++ test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
++ done
++
++maintainer-clean: gitignore-clean
++gitignore-clean:
++ -rm -f $(srcdir)/.gitignore
++
++.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
+diff --git a/tests/lib/telepathy/tpf-test.deps b/tests/lib/telepathy/tpf-test.deps
+new file mode 100644
+index 0000000..1bce19e
+--- /dev/null
++++ b/tests/lib/telepathy/tpf-test.deps
+@@ -0,0 +1,7 @@
++glib-2.0
++gobject-2.0
++gio-2.0
++gee-0.8
++folks
++telepathy-glib
++tp-test-contactlist
diff --git a/debian/patches/series b/debian/patches/series
index bc3592b..bafcbc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+git-files.patch
0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch
0002-Fixed-EDS-persona-store-display-name-value.patch
0003-Replaced-use-of-EVCard.remove_attribute-to-EVCard.re.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/folks.git
More information about the Pkg-telepathy-commits
mailing list