5 files changed, 2 insertions, 61 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2e42eda..d74ca48 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -19,47 +19,6 @@ install (FILES "${UPSTART_JOB_FILE}"
          DESTINATION "${UPSTART_JOBS_DIR}")
 
 ##
-##  XDG Autostart File
-##
-
-# where to install
-set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
-message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
-
-set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
-set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
-set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
-
-# install it
-install (FILES "${XDG_AUTOSTART_FILE}"
-         DESTINATION "${XDG_AUTOSTART_DIR}")
-
-##
-##  Upstart XDG Autostart Override
-##
-
-# where to install
-set (UPSTART_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/upstart/xdg/autostart")
-message (STATUS "${UPSTART_XDG_AUTOSTART_DIR} is the Upstart XDG autostart override dir")
-
-set (UPSTART_XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.upstart.desktop")
-set (UPSTART_XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_XDG_AUTOSTART_NAME}")
-set (UPSTART_XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_XDG_AUTOSTART_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${UPSTART_XDG_AUTOSTART_FILE_IN}" "${UPSTART_XDG_AUTOSTART_FILE}")
-
-# install it
-install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
-         DESTINATION "${UPSTART_XDG_AUTOSTART_DIR}"
-         RENAME "${XDG_AUTOSTART_NAME}")
-
-##
 ##  Systemd Unit File
 ##
 
diff --git a/data/indicator-display.desktop.in b/data/indicator-display.desktop.in
deleted file mode 100644
index b0017b1..0000000
--- a/data/indicator-display.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Display
-Exec=@pkglibexecdir@/indicator-display-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-display.upstart.desktop.in b/data/indicator-display.upstart.desktop.in
deleted file mode 100644
index 7e6cfe6..0000000
--- a/data/indicator-display.upstart.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Display
-Exec=@pkglibexecdir@/indicator-display-service
-OnlyShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true
diff --git a/debian/control b/debian/control
index 6deae40..6a9183a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,7 @@ Build-Depends: cmake,
                libqtdbusmock1-dev,
                libqtdbustest1-dev,
                cppcheck,
-               libgtest-dev,
-               google-mock (>= 1.6.0+svn437),
+               googletest | google-mock (>= 1.6.0+svn437),
                gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813),
 # for packaging
                debhelper (>= 9),
diff --git a/debian/indicator-display.maintscript b/debian/indicator-display.maintscript
new file mode 100644
index 0000000..2f6e7f6
--- /dev/null
+++ b/debian/indicator-display.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/indicator-display.desktop 0replaceme~