[SCM] kpackage packaging branch, master, updated. debian/5.37.0-2-83-gd1244e3
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:49:02 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kpackage.git;a=commitdiff;h=e7cc731
The following commit has been merged in the master branch:
commit e7cc73179ef79e5da772c7f872e6073287e3f5a1
Author: Harald Sitter <sitter at kde.org>
Date: Mon Nov 21 08:51:19 2016 +0100
Revert "add patch from master source"
This reverts commit c8b6a3fdda43af9929370e7dd55a5ddc2e2919ff.
---
.../0001-keep-installing-metadata.desktop.patch | 30 ----------------------
debian/patches/series | 1 -
2 files changed, 31 deletions(-)
diff --git a/debian/patches/0001-keep-installing-metadata.desktop.patch b/debian/patches/0001-keep-installing-metadata.desktop.patch
deleted file mode 100644
index 425d022..0000000
--- a/debian/patches/0001-keep-installing-metadata.desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e7861d979c71815a614f2baf0b3d25f329fadef0 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart at gmail.com>
-Date: Fri, 18 Nov 2016 15:51:49 +0100
-Subject: [PATCH] keep installing metadata.desktop
-
-there are too many existing users that rely on existence of metadata.desktop,
-so keep installing it, even if with new plasma-workspace releases only the
-metadata.json would be used. the framework should never change its behavior
-wrt old software, even if it was doing something in a sense wrong
-CCMAIL: Aleix Pol Gonzalez <aleixpol at kde.org>
-BUG:372594
----
- KF5PackageMacros.cmake | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
-index cc5aae2..a14ab0b 100644
---- a/KF5PackageMacros.cmake
-+++ b/KF5PackageMacros.cmake
-@@ -31,7 +31,6 @@ function(kpackage_install_package dir component)
- set(install_dir ${KPACKAGE_RELATIVE_DATA_INSTALL_DIR})
- endif()
- install(DIRECTORY ${dir}/ DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component}
-- PATTERN metadata.desktop EXCLUDE
- PATTERN .svn EXCLUDE
- PATTERN CMakeLists.txt EXCLUDE
- PATTERN Messages.sh EXCLUDE
---
-2.7.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0af97f3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-keep-installing-metadata.desktop.patch
--
kpackage packaging
More information about the pkg-kde-commits
mailing list