diff --git a/debian/changelog b/debian/changelog index 75afe75..2d26ae6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ nm-tray (0.4.0-0ubuntu1) UNRELEASED; urgency=medium * Remove gilir as an uploader as he has left the team. * Bump KF5 dependencies to 5.36.0. * Update copyright. + * Remove upstream-applicable fix-xdg-install-dir.patch. -- Simon Quigley Thu, 05 Jul 2018 17:34:18 -0500 diff --git a/debian/patches/fix-xdg-install-dir.patch b/debian/patches/fix-xdg-install-dir.patch deleted file mode 100644 index 4721b72..0000000 --- a/debian/patches/fix-xdg-install-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,7 +25,7 @@ set(TRANSLATION_DIR "${CMAKE_INSTALL_FUL - add_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS "-DTRANSLATION_DIR=\"${TRANSLATION_DIR}\"" "-DNM_TRAY_VERSION=\"${NM_TRAY_VERSION}\"") - if (NOT NM_TRAY_XDG_AUTOSTART_DIR) - #Note: we need the default to be /etc... (not the ${CMAKE_INSTALL_PREFIX}/etc) -- set(NM_TRAY_XDG_AUTOSTART_DIR "/${CMAKE_INSTALL_SYSCONFDIR}/xdg/autostart") -+ set(NM_TRAY_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/autostart") - endif () - - message(STATUS "Translations destination dir: ${TRANSLATION_DIR}") diff --git a/debian/patches/series b/debian/patches/series index a473cc1..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -fix-xdg-install-dir.patch