[SCM] KDE Base Applications module packaging branch, kde4.10, updated. debian/4.8.4-2-11-ge16f4ac
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sun Mar 10 13:56:08 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-baseapps.git;a=commitdiff;h=5686de4
The following commit has been merged in the kde4.10 branch:
commit 5686de4b2d8c996fd8dc61babc5ef44c2fc663a2
Author: Josep Febrer Salord <jfebrer at gmail.com>
Date: Tue Feb 19 00:53:00 2013 +0100
Refresh patches.
---
debian/changelog | 5 +++++
debian/patches/enable_debianabimanager.diff | 2 +-
debian/patches/enable_dlrestrictions.diff | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7e633da..fcd15a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ kde-baseapps (4:4.10.0-0r0) UNRELEASED; urgency=low
* Update installed files.
* Add lintian overrides for hardening-no-fortify-functions.
+ [ Josep Febrer ]
+ * Refresh patches:
+ - enable_debianabimanager.diff.
+ - enable_dlrestrictions.diff.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 11 Jan 2013 00:43:45 +0100
kde-baseapps (4:4.8.4-2) unstable; urgency=low
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 21ec0c4..023a0d5 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -7,7 +7,7 @@ For more information about DebianABIManager, refer to
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -39,6 +39,8 @@ if ( Q_WS_X11 )
+@@ -53,6 +53,8 @@ if ( Q_WS_X11 )
endif ( Q_WS_X11 )
macro_optional_add_subdirectory( doc )
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index 7e01a8e..eda19df 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -9,7 +9,7 @@ not stable and structures frequently conflict.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -41,6 +41,13 @@ macro_optional_add_subdirectory( doc )
+@@ -55,6 +55,13 @@ macro_optional_add_subdirectory( doc )
include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list