From c44018746852407991f54d65da2418a6fc6abf6e Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 6 Oct 2018 16:54:54 -0500 Subject: [PATCH] Remove the reverse-applicable fix-internal-version.patch. --- debian/changelog | 1 + debian/patches/fix-internal-version.patch | 15 --------------- .../patches/generalize-terminal-for-edits.patch | 2 +- debian/patches/series | 1 - 4 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 debian/patches/fix-internal-version.patch diff --git a/debian/changelog b/debian/changelog index 6f7a8e6..9852915 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ nm-tray (0.4.1-0ubuntu1) UNRELEASED; urgency=medium * New upstream bugfix release. * Bump Standards-version to 4.2.1, no changes needed. + * Remove the reverse-applicable fix-internal-version.patch. -- Simon Quigley Sat, 06 Oct 2018 16:53:00 -0500 diff --git a/debian/patches/fix-internal-version.patch b/debian/patches/fix-internal-version.patch deleted file mode 100644 index 9145f65..0000000 --- a/debian/patches/fix-internal-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Bump the internal version, missed in the new upstream release -Author: Simon Quigley -Forwarded: https://github.com/palinek/nm-tray/issues/29 -Last-Update: 2018-07-05 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ project(nm-tray) - cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) - cmake_policy(SET CMP0071 NEW) - --set(NM_TRAY_VERSION "0.3.0") -+set(NM_TRAY_VERSION "0.4.0") - - set(QT_MIN_VERSION "5.4.0") - set(KF5_MIN_VERSION "5.36.0") diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch index 692b839..acbb64d 100644 --- a/debian/patches/generalize-terminal-for-edits.patch +++ b/debian/patches/generalize-terminal-for-edits.patch @@ -1,6 +1,6 @@ Description: Use x-terminal emulator in lieu of xterm for connection edits. Author: Walter Lapchynski -Bug: https://launchpad.net/bugs/1786978 +Bug: https://launchpad.net/bugs/1786978 --- a/resources/nm-tray.conf +++ b/resources/nm-tray.conf @@ -1,3 +1,3 @@ diff --git a/debian/patches/series b/debian/patches/series index d628ab7..7cdc5d4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -fix-internal-version.patch generalize-terminal-for-edits.patch blacklist-from-menu.patch