[SCM] muon packaging branch, master, updated. debian/5.6.0-1-10-g4c829a4

Pino Toscano pino at moszumanska.debian.org
Wed Nov 29 07:17:53 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=3b370a5

The following commit has been merged in the master branch:
commit 3b370a5bce148b2e41794327bda61d9e804dad5c
Author: Pino Toscano <pino at debian.org>
Date:   Wed Nov 29 08:08:27 2017 +0100

    update the patches
    
    - no-canonical-support: refresh, and add the .diff suffix to its
      filename
---
 debian/changelog                                                  | 2 ++
 .../patches/{no-canonical-support => no-canonical-support.diff}   | 8 +++-----
 debian/patches/series                                             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc95127..c69a097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ muon (4:5.7.0-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - no-canonical-support: refresh, and add the .diff suffix to its filename
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 13:08:26 +0200
 
diff --git a/debian/patches/no-canonical-support b/debian/patches/no-canonical-support.diff
similarity index 88%
rename from debian/patches/no-canonical-support
rename to debian/patches/no-canonical-support.diff
index f41936a..dec1730 100644
--- a/debian/patches/no-canonical-support
+++ b/debian/patches/no-canonical-support.diff
@@ -8,11 +8,9 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791875
 Forwarded: not-needed
 Last-Update: 2016-07-14
 
-Index: muon-5.6.0/src/DetailsTabs/MainTab.cpp
-===================================================================
---- muon-5.6.0.orig/src/DetailsTabs/MainTab.cpp	2016-07-14 21:16:59.311134381 -0400
-+++ muon-5.6.0/src/DetailsTabs/MainTab.cpp	2016-07-14 21:16:59.303134381 -0400
-@@ -178,19 +178,19 @@
+--- a/src/DetailsTabs/MainTab.cpp
++++ b/src/DetailsTabs/MainTab.cpp
+@@ -179,19 +179,19 @@ void MainTab::refresh()
      m_packageShortDescLabel->setText(m_package->shortDescription());
  
      m_descriptionBrowser->setText(m_package->longDescription());
diff --git a/debian/patches/series b/debian/patches/series
index 5e52632..eb90c1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-no-canonical-support
+no-canonical-support.diff

-- 
muon packaging



More information about the pkg-kde-commits mailing list