diff -u indicator-sound-12.10.2+16.04.20160120/debian/changelog indicator-sound-12.10.2+16.04.20160120/debian/changelog
--- indicator-sound-12.10.2+16.04.20160120/debian/changelog
+++ indicator-sound-12.10.2+16.04.20160120/debian/changelog
@@ -1,3 +1,9 @@
+indicator-sound (12.10.2+16.04.20160120-0ubuntu2) xenial; urgency=medium
+
+  * Build using libgee-0.8-dev instead of libgee-dev. LP: #1502094.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Feb 2016 18:07:24 +0100
+
 indicator-sound (12.10.2+16.04.20160120-0ubuntu1) xenial; urgency=medium
 
   [ Xavi Garcia Mena ]
diff -u indicator-sound-12.10.2+16.04.20160120/debian/control indicator-sound-12.10.2+16.04.20160120/debian/control
--- indicator-sound-12.10.2+16.04.20160120/debian/control
+++ indicator-sound-12.10.2+16.04.20160120/debian/control
@@ -27,7 +27,7 @@
                libpulse-dev (>= 1:4.0-0ubuntu21),
                libpulse-mainloop-glib0 (>= 0.9.18),
                libnotify-dev,
-               libgee-dev,
+               libgee-0.8-dev,
                libxml2-dev,
                pulseaudio,
                python3-dbusmock,
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/.pc/.quilt_patches
+++ indicator-sound-12.10.2+16.04.20160120/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/.pc/.quilt_series
+++ indicator-sound-12.10.2+16.04.20160120/.pc/.quilt_series
@@ -0,0 +1 @@
+series
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/.pc/.version
+++ indicator-sound-12.10.2+16.04.20160120/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/.pc/applied-patches
+++ indicator-sound-12.10.2+16.04.20160120/.pc/applied-patches
@@ -0,0 +1 @@
+libgee-0.8.diff
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/.pc/libgee-0.8.diff/CMakeLists.txt
+++ indicator-sound-12.10.2+16.04.20160120/.pc/libgee-0.8.diff/CMakeLists.txt
@@ -0,0 +1,87 @@
+project(indicator-sound C CXX)
+cmake_minimum_required(VERSION 2.8.9)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+set(PACKAGE ${CMAKE_PROJECT_NAME})
+set(GETTEXT_PACKAGE indicator-sound)
+set(GNOMELOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
+
+add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )
+
+find_package(PkgConfig REQUIRED)
+include(GNUInstallDirs)
+include(Coverage)
+include(UseVala)
+
+# Workaround for libexecdir on debian
+if (EXISTS "/etc/debian_version") 
+  set(CMAKE_INSTALL_LIBEXECDIR ${CMAKE_INSTALL_LIBDIR})
+  set(CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
+endif()
+
+set(SOURCE_DIR "${CMAKE_SOURCE_DIR}/src")
+set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DIR}/src")
+
+set(PULSE_AUDIO_REQUIRED_VERSION 0.9.19)
+set(GLIB_2_0_REQUIRED_VERSION 2.32)
+set(GIO_2_0_REQUIRED_VERSION 2.25.13)
+set(URL_DISPATCHER_1_REQUIRED_VERSION 1)
+
+pkg_check_modules(
+  PULSEAUDIO REQUIRED
+  libpulse-mainloop-glib>=${PULSE_AUDIO_REQUIRED_VERSION}
+  glib-2.0>=${GLIB_2_0_REQUIRED_VERSION}
+  gio-unix-2.0>=${GIO_2_0_REQUIRED_VERSION}
+  url-dispatcher-1>=${URL_DISPATCHER_1_REQUIRED_VERSION}
+)
+include_directories(${PULSEAUDIO_INCLUDE_DIRS})
+
+pkg_check_modules(
+  SOUNDSERVICE REQUIRED
+  gee-1.0
+  gio-2.0>=${GIO_2_0_REQUIRED_VERSION}
+  gio-unix-2.0
+  gthread-2.0
+  libxml-2.0
+  libnotify
+  accountsservice
+)
+include_directories(${SOUNDSERVICE_INCLUDE_DIRS})
+
+pkg_check_modules(
+  TEST REQUIRED
+  dbustest-1>=15.04.0
+)
+include_directories(${TEST_INCLUDE_DIRS})
+
+find_package(Vala 0.20)
+
+find_package(GObjectIntrospection 0.9.12)
+
+include_directories(${SOURCE_DIR})
+include_directories(${SOURCE_BINARY_DIR})
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+add_definitions(
+  -Wall
+)
+
+configure_file(
+  "config.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/config.h"
+)
+
+add_subdirectory(data)
+add_subdirectory(src)
+
+enable_testing()
+
+set (GTEST_SOURCE_DIR /usr/src/gtest/src)
+set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
+set (GTEST_LIBS -lpthread)
+
+add_subdirectory(tests)
+
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/.pc/libgee-0.8.diff/src/CMakeLists.txt
+++ indicator-sound-12.10.2+16.04.20160120/.pc/libgee-0.8.diff/src/CMakeLists.txt
@@ -0,0 +1,269 @@
+
+###########################
+# Vala Generation
+###########################
+
+set(HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.h")
+set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def")
+set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi")
+
+vapi_gen(accounts-service
+    LIBRARY
+        accounts-service
+    PACKAGES
+        gio-2.0
+    INPUT
+        /usr/share/gir-1.0/AccountsService-1.0.gir
+)
+
+vala_init(indicator-sound-service
+  DEPENDS
+    accounts-service
+  PACKAGES
+    config
+    gee-1.0
+    gio-2.0
+    gio-unix-2.0
+    libxml-2.0
+    libpulse
+    libpulse-mainloop-glib
+    libnotify
+    accounts-service
+  OPTIONS
+    --ccode
+    --thread
+    --target-glib=${GLIB_2_0_REQUIRED_VERSION}
+    --vapidir=${CMAKE_SOURCE_DIR}/vapi/
+    --vapidir=.
+    --pkg=url-dispatcher
+    --pkg=bus-watcher
+)
+
+vala_add(indicator-sound-service
+  notification.vala
+)
+vala_add(indicator-sound-service
+  info-notification.vala
+  DEPENDS
+    notification
+      volume-control
+        options
+)
+vala_add(indicator-sound-service
+  warn-notification.vala
+  DEPENDS
+    notification
+)
+vala_add(indicator-sound-service
+  service.vala
+  DEPENDS
+    sound-menu
+    volume-control
+    volume-control-pulse
+    notification
+    info-notification
+    volume-warning
+    options
+    options-gsettings
+    media-player
+    media-player-list
+    mpris2-interfaces
+    accounts-service-user
+)
+vala_add(indicator-sound-service
+  options.vala
+  DEPENDS
+    volume-control
+    volume-control-pulse
+)
+vala_add(indicator-sound-service
+  options-gsettings.vala
+  DEPENDS
+    options
+      volume-control-pulse
+    volume-control
+)
+vala_add(indicator-sound-service
+  volume-control.vala
+  DEPENDS
+    options
+      volume-control-pulse
+)
+vala_add(indicator-sound-service
+  volume-control-pulse.vala
+  DEPENDS
+    options
+    volume-control
+)
+vala_add(indicator-sound-service
+  volume-warning.vala
+  DEPENDS
+    options
+      volume-control-pulse
+    volume-control
+    warn-notification
+      notification
+)
+vala_add(indicator-sound-service
+  volume-warning-pulse.vala
+  DEPENDS
+    volume-warning
+      options
+        volume-control-pulse
+      volume-control
+      warn-notification
+        notification
+)
+vala_add(indicator-sound-service
+  media-player.vala
+)
+vala_add(indicator-sound-service
+  media-player-mpris.vala
+  DEPENDS
+    media-player
+    mpris2-interfaces
+)
+vala_add(indicator-sound-service
+  media-player-user.vala
+  DEPENDS
+    media-player
+    accounts-service-sound-settings
+    greeter-broadcast
+)
+vala_add(indicator-sound-service
+  media-player-list.vala
+  DEPENDS
+    media-player
+)
+vala_add(indicator-sound-service
+  media-player-list-mpris.vala
+  DEPENDS
+    media-player-list
+    media-player
+    media-player-mpris
+    mpris2-interfaces
+)
+vala_add(indicator-sound-service
+  media-player-list-greeter.vala
+  DEPENDS
+    media-player-list
+    media-player-user
+    media-player
+)
+vala_add(indicator-sound-service
+  mpris2-interfaces.vala
+)
+vala_add(indicator-sound-service
+  freedesktop-interfaces.vala
+)
+vala_add(indicator-sound-service
+  sound-menu.vala
+  DEPENDS
+    media-player
+    volume-control
+      options
+          volume-control-pulse
+)
+vala_add(indicator-sound-service
+  accounts-service-user.vala
+  DEPENDS
+    media-player
+    mpris2-interfaces
+    accounts-service-sound-settings
+    accounts-service-privacy-settings
+    accounts-service-system-sound-settings
+    greeter-broadcast
+)
+vala_add(indicator-sound-service
+  accounts-service-sound-settings.vala
+)
+vala_add(indicator-sound-service
+  accounts-service-privacy-settings.vala
+)
+vala_add(indicator-sound-service
+  accounts-service-system-sound-settings.vala
+)
+vala_add(indicator-sound-service
+  greeter-broadcast.vala
+)
+
+vala_finish(indicator-sound-service
+  SOURCES
+    project_VALA_SOURCES
+  OUTPUTS
+    project_VALA_C
+  GENERATE_HEADER
+    ${HEADER_PATH}
+  GENERATE_SYMBOLS
+    ${SYMBOLS_PATH}
+  GENERATE_VAPI
+    ${VAPI_PATH}
+)
+
+set_source_files_properties(
+  ${project_VALA_SOURCES}
+  PROPERTIES
+  HEADER_FILE_ONLY TRUE
+)
+
+set(
+  INDICATOR_SOUND_SOURCES
+  ${project_VALA_SOURCES}
+  ${project_VALA_C}
+  bus-watch-namespace.c
+  ${SYMBOLS_PATH}
+)
+
+###########################
+# Lib
+###########################
+
+add_definitions(
+  -w
+  -DG_LOG_DOMAIN="indicator-sound"
+)
+
+add_library(
+    indicator-sound-service-lib STATIC
+    ${INDICATOR_SOUND_SOURCES}
+)
+
+target_link_libraries(
+  indicator-sound-service-lib
+  ${SOUNDSERVICE_LIBRARIES}
+  -lm
+)
+
+###########################
+# Executable
+###########################
+
+include_directories(${CMAKE_BINARY_DIR})
+
+add_executable(
+  indicator-sound-service-bin
+  main.c
+)
+
+set_target_properties(
+  indicator-sound-service-bin
+  PROPERTIES
+  OUTPUT_NAME "indicator-sound-service"
+)
+
+target_link_libraries(
+  indicator-sound-service-bin
+  indicator-sound-service-lib
+  ${PULSEAUDIO_LIBRARIES}
+)
+
+###########################
+# Installation
+###########################
+
+install(
+  TARGETS indicator-sound-service-bin
+  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
+)
+
+add_subdirectory(gmenuharness)
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/CMakeLists.txt
+++ indicator-sound-12.10.2+16.04.20160120/CMakeLists.txt
@@ -39,7 +39,7 @@
 
 pkg_check_modules(
   SOUNDSERVICE REQUIRED
-  gee-1.0
+  gee-0.8
   gio-2.0>=${GIO_2_0_REQUIRED_VERSION}
   gio-unix-2.0
   gthread-2.0
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/debian/patches/series
+++ indicator-sound-12.10.2+16.04.20160120/debian/patches/series
@@ -0,0 +1 @@
+libgee-0.8.diff
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/po/indicator-sound.pot
+++ indicator-sound-12.10.2+16.04.20160120/po/indicator-sound.pot
@@ -0,0 +1,129 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-12 17:05+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/info-notification.vala:25 ../src/info-notification.vala:42
+#: ../src/service.vala:262 ../src/service.vala:265 ../src/sound-menu.vala:47
+#: ../src/sound-menu.vala:203 ../src/warn-notification.vala:31
+msgid "Volume"
+msgstr ""
+
+#: ../src/info-notification.vala:55
+msgid "Speakers"
+msgstr ""
+
+#: ../src/info-notification.vala:57
+msgid "Headphones"
+msgstr ""
+
+#: ../src/info-notification.vala:59
+msgid "Bluetooth headphones"
+msgstr ""
+
+#: ../src/info-notification.vala:61
+msgid "Bluetooth speaker"
+msgstr ""
+
+#: ../src/info-notification.vala:63
+msgid "Usb speaker"
+msgstr ""
+
+#: ../src/info-notification.vala:65
+msgid "Usb headphones"
+msgstr ""
+
+#: ../src/info-notification.vala:67
+msgid "HDMI speaker"
+msgstr ""
+
+#: ../src/info-notification.vala:69
+msgid "HDMI headphones"
+msgstr ""
+
+#: ../src/service.vala:259
+msgid "Volume (muted)"
+msgstr ""
+
+#: ../src/service.vala:262
+msgid "silent"
+msgstr ""
+
+#: ../src/service.vala:270
+msgid "Sound"
+msgstr ""
+
+#: ../src/sound-menu.vala:40
+msgid "Mute"
+msgstr ""
+
+#: ../src/sound-menu.vala:42
+msgid "Silent Mode"
+msgstr ""
+
+#: ../src/sound-menu.vala:56
+msgid "Sound Settings…"
+msgstr ""
+
+#: ../src/sound-menu.vala:102
+msgid "Microphone Volume"
+msgstr ""
+
+#. NOTE: Action doesn't really exist, just used to find below when removing
+#: ../src/sound-menu.vala:125 ../src/warn-notification.vala:32
+msgid "High volume can damage your hearing."
+msgstr ""
+
+#: ../src/sound-menu.vala:206
+msgid "Volume (Headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:209
+msgid "Volume (Bluetooth)"
+msgstr ""
+
+#: ../src/sound-menu.vala:212
+msgid "Volume (Usb)"
+msgstr ""
+
+#: ../src/sound-menu.vala:215
+msgid "Volume (HDMI)"
+msgstr ""
+
+#: ../src/sound-menu.vala:218
+msgid "Volume (Bluetooth headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:221
+msgid "Volume (Usb headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:224
+msgid "Volume (HDMI headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:380
+msgid "Choose Playlist"
+msgstr ""
+
+#: ../src/warn-notification.vala:49
+msgid "OK"
+msgstr ""
+
+#: ../src/warn-notification.vala:52
+msgid "Cancel"
+msgstr ""
only in patch2:
unchanged:
--- indicator-sound-12.10.2+16.04.20160120.orig/src/CMakeLists.txt
+++ indicator-sound-12.10.2+16.04.20160120/src/CMakeLists.txt
@@ -21,7 +21,7 @@
     accounts-service
   PACKAGES
     config
-    gee-1.0
+    gee-0.8
     gio-2.0
     gio-unix-2.0
     libxml-2.0