diff -u unity-lens-video-0.3.15+13.10.20130920/debian/control unity-lens-video-0.3.15+13.10.20130920/debian/control --- unity-lens-video-0.3.15+13.10.20130920/debian/control +++ unity-lens-video-0.3.15+13.10.20130920/debian/control @@ -7,7 +7,7 @@ dh-translations, gnome-common, libdee-dev (>= 1.0.7), - libgee-dev, + libgee-0.8-dev, libglib2.0-dev (>= 2.27), libjson-glib-dev, libsoup-gnome2.4-dev, diff -u unity-lens-video-0.3.15+13.10.20130920/debian/changelog unity-lens-video-0.3.15+13.10.20130920/debian/changelog --- unity-lens-video-0.3.15+13.10.20130920/debian/changelog +++ unity-lens-video-0.3.15+13.10.20130920/debian/changelog @@ -1,3 +1,9 @@ +unity-lens-video (0.3.15+13.10.20130920-0ubuntu2) xenial; urgency=medium + + * Build using libgee-0.8-dev instead of libgee-dev. + + -- Matthias Klose Fri, 12 Feb 2016 17:49:41 +0100 + unity-lens-video (0.3.15+13.10.20130920-0ubuntu1) saucy; urgency=low [ Michal Hruby ] only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/.quilt_patches +++ unity-lens-video-0.3.15+13.10.20130920/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/.quilt_series +++ unity-lens-video-0.3.15+13.10.20130920/.pc/.quilt_series @@ -0,0 +1 @@ +series only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/.version +++ unity-lens-video-0.3.15+13.10.20130920/.pc/.version @@ -0,0 +1 @@ +2 only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/applied-patches +++ unity-lens-video-0.3.15+13.10.20130920/.pc/applied-patches @@ -0,0 +1 @@ +libgee-0.8.diff only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/libgee-0.8.diff/configure.ac +++ unity-lens-video-0.3.15+13.10.20130920/.pc/libgee-0.8.diff/configure.ac @@ -0,0 +1,209 @@ +AC_INIT(unity-lens-video, 6.9.0, https://launchpad.net/unity-lens-video) +AC_COPYRIGHT([Copyright 2012 Canonical]) + +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + +##################################################### +# Silent build rules +##################################################### +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + +AC_PREREQ(2.59) + +AC_CONFIG_HEADERS([config.h]) + +##################################################### +# Init the other things we depend on +##################################################### +AM_MAINTAINER_MODE +AM_PROG_VALAC([0.16.0]) +AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])]) +AC_PROG_CC +AM_PROG_CC_C_O +AC_HEADER_STDC + +LT_INIT +AC_CONFIG_MACRO_DIR([m4]) + +############################################# +# Gettext +############################################# +GETTEXT_PACKAGE="$PACKAGE" +AC_SUBST(GETTEXT_PACKAGE) +#AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext domain]) +AM_GLIB_GNU_GETTEXT + +# AM_GNOME_GETTEXT above substs $DATADIRNAME +# this is the directory where the *.{mo,gmo} files are installed +localedir='${prefix}/${DATADIRNAME}/locale' +AC_SUBST(localedir) + +IT_PROG_INTLTOOL([0.40.0]) + +AC_DEFINE_UNQUOTED(LOCALE_DIR, "${PREFIX}/${DATADIRNAME}/locale",[Locale directory]) +AC_DEFINE_UNQUOTED(DATADIR, "${PREFIX}/${DATADIRNAME}",[Data directory]) +AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory]) + +###################################################### +# intltool rule for generating translated .scope file +###################################################### +INTLTOOL_SCOPE_RULE='%.scope: %.scope.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +AC_SUBST(INTLTOOL_SCOPE_RULE) + +########################### +# gcov coverage reporting +########################### +m4_include([m4/gcov.m4]) +AC_TDD_GCOV +AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) +AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) +AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) +AC_SUBST(COVERAGE_CFLAGS) +AC_SUBST(COVERAGE_LDFLAGS) + +##################################################### +# Check for module and library dependancies +##################################################### +GLIB_REQUIRED=2.27 +PKG_CHECK_MODULES(SCOPE_DAEMON, + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED + gio-unix-2.0 >= $GLIB_REQUIRED + dee-1.0 >= 1.0.7 + gee-1.0 + libsoup-gnome-2.4 + json-glib-1.0 + zeitgeist-1.0 >= 0.3.8 + unity >= 7.0.0 + unity-extras >= 6.91.11 + ) + +AC_SUBST(SCOPE_DAEMON_CFLAGS) +AC_SUBST(SCOPE_DAEMON_LIBS) + +#################################################################### +# C compiler warnings +#################################################################### +AC_ARG_ENABLE([c-warnings], + AC_HELP_STRING([--enable-c-warnings=@<:@no/yes@:>@], [show warnings from the C compiler @<:@default=no@:>@]),, + [enable_c_warnings=no]) + +if test "x$enable_c_warnings" = "xyes"; then + AC_DEFINE(ENABLE_C_WARNINGS, 1, [show warnings from the C compiler]) +fi + +AM_CONDITIONAL(ENABLE_C_WARNINGS, test "$enable_c_warnings" = "yes") + +##################################################### +# local install for distcheck and stand-alone running +##################################################### +with_localinstall="no" +AC_ARG_ENABLE(localinstall, + AS_HELP_STRING([--enable-localinstall], + [Install all of the files locally instead of in system directories (for distcheck)]), + with_localinstall=$enableval, + with_localinstall=no) + +AM_CONDITIONAL([HAVE_LOCALINSTALL], [test "x$with_localinstall" = "xyes"]) + +#################################################################### +# Headless tests +#################################################################### +AC_ARG_ENABLE([headless-tests], + AS_HELP_STRING([--enable-headless-tests=@<:@no/yes@:>@],[enable headless test suite (requires Xvfb) @<:@default=no@:>@]),, + [enable_headless_tests=no]) + +AM_CONDITIONAL([ENABLE_HEADLESS_TESTS],[test "x$enable_headless_tests" != "xno"]) + +if test "x$enable_headless_tests" = "xyes"; then + AC_PATH_PROG([XVFB],[xvfb-run]) +fi + +##################################################### +# local install for distcheck and stand-alone running +##################################################### +with_localinstall="no" +AC_ARG_ENABLE(localinstall, + AS_HELP_STRING([--enable-localinstall], + [Install all of the files locally instead of in system directories (for distcheck)]), + with_localinstall=$enableval, + with_localinstall=no) + +AM_CONDITIONAL([HAVE_LOCALINSTALL], [test "x$with_localinstall" = "xyes"]) + +##################################################### +# Expand variables needed for config.vala +##################################################### +AS_AC_EXPAND(PREFIX, $prefix) +AC_SUBST(PREFIX) + +AS_AC_EXPAND(DATADIR, $datarootdir) +AC_SUBST(DATADIR) + +##################################################### +# Look for dbus service dir +##################################################### +if test "x$with_localinstall" = "xyes"; then + DBUSSERVICEDIR="${datadir}/dbus-1/services/" +else + DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` +fi +AC_SUBST(DBUSSERVICEDIR) + +##################################################### +# Look for correct Scopes dir +##################################################### +if test "x$with_localinstall" = "xyes"; then + SCOPESDIR="${datadir}/unity/scopes" +else + SCOPESDIR=`$PKG_CONFIG --variable=scopesdir unity` +fi +AC_SUBST(SCOPESDIR) + +############################################# +# GSettings macros +############################################# + +GLIB_GSETTINGS + +##################################################### +# Create the Makefiles +##################################################### +AC_CONFIG_FILES([ + Makefile + data/Makefile + data/local.scope.in + data/remote.scope.in + src/Makefile + po/Makefile.in + src/config.vala + tests/unit/config-tests.vala + tests/unit/Makefile + vapi/Makefile +]) +AC_OUTPUT + +##################################################### +# Output the results +##################################################### +AC_MSG_NOTICE([ + + Unity Video Lens Daemon $VERSION + ---------------------------------- + + Prefix : ${prefix} + + Local install : ${with_localinstall} + + Extra CFlags : ${CPPFLAGS} $MAINTAINER_CFLAGS + Extra ValaFlags : ${CPPFLAGS} $MAINTAINER_VALAFLAGS + + Scopes Directory: ${SCOPESDIR} + + Testing + Headless tests : ${enable_headless_tests} + Coverage reporting : ${use_gcov} + +]) only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/libgee-0.8.diff/src/Makefile.am +++ unity-lens-video-0.3.15+13.10.20130920/.pc/libgee-0.8.diff/src/Makefile.am @@ -0,0 +1,135 @@ +NULL = +BUILT_SOURCES = +CLEANFILES = +EXTRA_DIST = + +DATADIR = $(datadir) + +AM_CFLAGS = -w +AM_CPPFLAGS = $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +pkglibexec_PROGRAMS = \ + unity-video-lens-daemon \ + unity-scope-video-remote \ + $(NULL) + +unity_video_lens_daemon_CPPFLAGS = \ + -DDATADIR=\"$(DATADIR)\" \ + -DPKGDATADIR=\"$(PKGDATADIR)\" \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DG_LOG_DOMAIN=\"unity-video-lens-daemon\" \ + $(SCOPE_DAEMON_CFLAGS) \ + $(MAINTAINER_CFLAGS) \ + -I$(srcdir) \ + $(NULL) + +unity_scope_video_remote_CPPFLAGS = \ + -DDATADIR=\"$(DATADIR)\" \ + -DPKGDATADIR=\"$(PKGDATADIR)\" \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DG_LOG_DOMAIN=\"unity-scope-video-remote\" \ + $(SCOPE_DAEMON_CFLAGS) \ + $(MAINTAINER_CFLAGS) \ + -I$(srcdir) \ + $(NULL) + +unity_video_lens_daemon_VALAFLAGS = \ + -C \ + --pkg dee-1.0 \ + --pkg unity \ + --pkg unity-extras \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg glib-2.0 \ + --pkg gee-1.0 \ + --pkg zeitgeist-1.0 \ + --vapidir $(srcdir) \ + --vapidir $(top_srcdir)/vapi \ + --target-glib=2.26 \ + $(MAINTAINER_VALAFLAGS) \ + $(NULL) + +unity_scope_video_remote_VALAFLAGS = \ + -C \ + --pkg dee-1.0 \ + --pkg unity \ + --pkg unity-extras \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg glib-2.0 \ + --pkg gee-1.0 \ + --pkg zeitgeist-1.0 \ + --pkg libsoup-gnome-2.4 \ + --pkg libsoup-2.4 \ + --pkg json-glib-1.0 \ + --vapidir $(srcdir) \ + --vapidir $(top_srcdir)/vapi \ + --target-glib=2.26 \ + $(MAINTAINER_VALAFLAGS) \ + $(NULL) + + +unity_video_lens_daemon_LDADD = \ + $(SCOPE_DAEMON_LIBS) \ + $(NULL) + +unity_scope_video_remote_LDADD = \ + $(SCOPE_DAEMON_LIBS) \ + $(NULL) + +unity_video_lens_daemon_VALASOURCES = \ + blacklist-tracker.vala \ + daemon.vala \ + main.vala \ + locate.vala \ + scope.vala \ + config.vala \ + thumbnailer.vala \ + utils.vala \ + video-file.vala \ + $(NULL) + +unity_scope_video_remote_VALASOURCES = \ + config.vala \ + remote-scope-globals.vala \ + remote-video-main.vala \ + remote-scope.vala \ + ubuntu-video-search.vala \ + utils.vala \ + video-file.vala \ + $(NULL) + +unity_video_lens_daemon_SOURCES = \ + $(unity_video_lens_daemon_VALASOURCES:.vala=.c) \ + $(NULL) + +unity_scope_video_remote_SOURCES = \ + $(unity_scope_video_remote_VALASOURCES:.vala=.c) \ + $(NULL) + +BUILT_SOURCES += \ + unity_video_lens_daemon.vala.stamp \ + unity_scope_video_remote.vala.stamp \ + $(NULL) + +EXTRA_DIST += \ + unity_video_lens_daemon.vala.stamp \ + unity_scope_video_remote.vala.stamp \ + $(unity_video_lens_daemon_VALASOURCES) \ + $(unity_scope_video_remote_VALASOURCES) \ + $(NULL) + +unity_video_lens_daemon.vala.stamp: $(unity_video_lens_daemon_VALASOURCES) + $(AM_V_GEN) $(VALAC) $(unity_video_lens_daemon_VALAFLAGS) $^ + @touch $@ + +unity_scope_video_remote.vala.stamp: $(unity_scope_video_remote_VALASOURCES) + $(AM_V_GEN) $(VALAC) $(unity_scope_video_remote_VALAFLAGS) $^ + @touch $@ + +CLEANFILES += \ + *.stamp \ + $(unity_video_lens_daemon_VALASOURCES:.vala=.c) \ + $(unity_scope_video_remote_VALASOURCES:.vala=.c) \ + $(NULL) only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/.pc/libgee-0.8.diff/tests/unit/Makefile.am +++ unity-lens-video-0.3.15+13.10.20130920/.pc/libgee-0.8.diff/tests/unit/Makefile.am @@ -0,0 +1,120 @@ +include $(top_srcdir)/Makefile.decl + +check_PROGRAMS = \ + test-locate \ + test-utils \ + test-ubuntu-video-search \ + $(NULL) + +TEST_PROGS += $(check_PROGRAMS) + +AM_VALAFLAGS = \ + --pkg dee-1.0 \ + --pkg unity \ + --pkg unity-extras \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg json-glib-1.0 \ + --pkg glib-2.0 \ + --pkg gee-1.0 \ + --pkg zeitgeist-1.0 \ + --pkg libsoup-gnome-2.4 \ + --pkg libsoup-2.4 \ + --vapidir $(srcdir) \ + --vapidir $(top_srcdir)/vapi \ + --target-glib=2.26 \ + $(MAINTAINER_VALAFLAGS) \ + $(NULL) + +LDADD = $(SCOPE_DAEMON_LIBS) \ + $(test_libs) + +AM_CPPFLAGS = \ + $(SCOPE_DAEMON_CFLAGS) \ + -I$(srcdir) \ + -I$(top_srcdir)/src \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +if !ENABLE_C_WARNINGS + AM_CPPFLAGS += -w +endif + +test_locate_VALASOURCES = \ + test-locate.vala \ + thumbnailer-mock.vala \ + config-tests.vala \ + $(top_srcdir)/src/locate.vala \ + $(top_srcdir)/src/utils.vala \ + $(top_srcdir)/src/video-file.vala \ + $(NULL) + +test_utils_VALASOURCES = \ + test-utils.vala \ + config-tests.vala \ + $(top_srcdir)/src/utils.vala \ + $(NULL) + +test_ubuntu_video_search_VALASOURCES = \ + test-ubuntu-video-search.vala \ + config-tests.vala \ + $(top_srcdir)/src/remote-scope-globals.vala \ + $(top_srcdir)/src/ubuntu-video-search.vala \ + $(top_srcdir)/src/video-file.vala \ + $(top_srcdir)/src/remote-scope.vala \ + $(top_srcdir)/src/utils.vala \ + $(NULL) + +nodist_test_locate_SOURCES = $(test_locate_VALASOURCES:.vala=.c) + +nodist_test_utils_SOURCES = $(test_utils_VALASOURCES:.vala=.c) + +nodist_test_ubuntu_video_search_SOURCES = $(test_ubuntu_video_search_VALASOURCES:.vala=.c) + +CLEANFILES = *.stamp \ + *.c \ + $(NULL) + +EXTRA_DIST = \ + $(test_locate_VALASOURCES) \ + $(test_utils_VALASOURCES) \ + $(test_ubuntu_video_search_VALASOURCES) \ + data/videosearch_input1.txt \ + data/videosearch_input2.txt \ + data/videosearch_details1.txt \ + data/video1.avi \ + data/video2.avi \ + data/video3.avi \ + data/video1.mpg \ + data/video2.mpg \ + data/video3.mpg \ + $(NULL) + +BUILT_SOURCES = \ + test-locate.vala.stamp \ + test-utils.vala.stamp \ + test-ubuntu-video-search.vala.stamp \ + $(NULL) + +test-locate.vala.stamp: $(test_locate_VALASOURCES) + $(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^ + @touch $@ + +test-utils.vala.stamp: $(test_utils_VALASOURCES) + $(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^ + @touch $@ + +test-ubuntu-video-search.vala.stamp: $(test_ubuntu_video_search_VALASOURCES) + $(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^ + @touch $@ + +# START HEADLESS TESTS +if ENABLE_HEADLESS_TESTS +test-headless: + $(XVFB) make test-nonrecursive; \ + sleep 1; +endif +# END HEADLESS TESTS only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/configure.ac +++ unity-lens-video-0.3.15+13.10.20130920/configure.ac @@ -72,7 +72,7 @@ gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED dee-1.0 >= 1.0.7 - gee-1.0 + gee-0.8 libsoup-gnome-2.4 json-glib-1.0 zeitgeist-1.0 >= 0.3.8 only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/debian/patches/libgee-0.8.diff +++ unity-lens-video-0.3.15+13.10.20130920/debian/patches/libgee-0.8.diff @@ -0,0 +1,48 @@ +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(SCOPE_DAEMON, + gio-2.0 >= $GLIB_REQUIRED + gio-unix-2.0 >= $GLIB_REQUIRED + dee-1.0 >= 1.0.7 +- gee-1.0 ++ gee-0.8 + libsoup-gnome-2.4 + json-glib-1.0 + zeitgeist-1.0 >= 0.3.8 +Index: b/src/Makefile.am +=================================================================== +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -42,7 +42,7 @@ unity_video_lens_daemon_VALAFLAGS = \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg glib-2.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --pkg zeitgeist-1.0 \ + --vapidir $(srcdir) \ + --vapidir $(top_srcdir)/vapi \ +@@ -58,7 +58,7 @@ unity_scope_video_remote_VALAFLAGS = \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg glib-2.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --pkg zeitgeist-1.0 \ + --pkg libsoup-gnome-2.4 \ + --pkg libsoup-2.4 \ +Index: b/tests/unit/Makefile.am +=================================================================== +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -16,7 +16,7 @@ AM_VALAFLAGS = \ + --pkg gio-unix-2.0 \ + --pkg json-glib-1.0 \ + --pkg glib-2.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --pkg zeitgeist-1.0 \ + --pkg libsoup-gnome-2.4 \ + --pkg libsoup-2.4 \ only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/debian/patches/series +++ unity-lens-video-0.3.15+13.10.20130920/debian/patches/series @@ -0,0 +1 @@ +libgee-0.8.diff only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/src/Makefile.am +++ unity-lens-video-0.3.15+13.10.20130920/src/Makefile.am @@ -42,7 +42,7 @@ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ --pkg glib-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg zeitgeist-1.0 \ --vapidir $(srcdir) \ --vapidir $(top_srcdir)/vapi \ @@ -58,7 +58,7 @@ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ --pkg glib-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg zeitgeist-1.0 \ --pkg libsoup-gnome-2.4 \ --pkg libsoup-2.4 \ only in patch2: unchanged: --- unity-lens-video-0.3.15+13.10.20130920.orig/tests/unit/Makefile.am +++ unity-lens-video-0.3.15+13.10.20130920/tests/unit/Makefile.am @@ -16,7 +16,7 @@ --pkg gio-unix-2.0 \ --pkg json-glib-1.0 \ --pkg glib-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg zeitgeist-1.0 \ --pkg libsoup-gnome-2.4 \ --pkg libsoup-2.4 \