5 files changed, 1 insertions, 101 deletions
diff --git a/cmake/UseGSettings.cmake b/cmake/UseGSettings.cmake
deleted file mode 100644
index e109692..0000000
--- a/cmake/UseGSettings.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
-
-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" OFF)
-
-if(GSETTINGS_LOCALINSTALL)
-    message(STATUS "GSettings schemas will be installed locally.")
-endif()
-
-if(GSETTINGS_COMPILE)
-    message(STATUS "GSettings shemas will be compiled.")
-endif()
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    # Have an option to not install the schema into where GLib is
-    if (GSETTINGS_LOCALINSTALL)
-        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-    else (GSETTINGS_LOCALINSTALL)
-        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-    endif (GSETTINGS_LOCALINSTALL)
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    if (GSETTINGS_COMPILE)
-        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
-    endif ()
-endmacro()
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 50ed054..8e0ba0d 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -69,47 +69,6 @@ install(
 )
 
 ###########################
-# XDG Autostart
-###########################
-
-set(
-  INDICATOR_SOUND_XDG_AUTOSTART
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
-)
-
-configure_file(
-  "indicator-sound.desktop.in"
-  ${INDICATOR_SOUND_XDG_AUTOSTART}
-  @ONLY
-)
-
-install(
-  FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
-  DESTINATION "/etc/xdg/autostart"
-)
-
-###########################
-# Upstart XDG Autostart Override
-###########################
-
-set(
-  INDICATOR_SOUND_UPSTART_XDG_AUTOSTART
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.upstart.desktop"
-)
-
-configure_file(
-  "indicator-sound.upstart.desktop.in"
-  ${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}
-  @ONLY
-)
-
-install(
-  FILES "${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}"
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/xdg/autostart"
-  RENAME "indicator-sound.desktop"
-)
-
-###########################
 # GSettings
 ###########################
 
diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
deleted file mode 100644
index 6d31a9a..0000000
--- a/data/indicator-sound.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;GNOME;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-sound.upstart.desktop.in b/data/indicator-sound.upstart.desktop.in
deleted file mode 100644
index 0380ab8..0000000
--- a/data/indicator-sound.upstart.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true
diff --git a/debian/indicator-sound.maintscript b/debian/indicator-sound.maintscript
new file mode 100644
index 0000000..c326262
--- /dev/null
+++ b/debian/indicator-sound.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/indicator-sound.desktop 0replaceme~