[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

Maximiliano Curia maxy at alioth.debian.org
Thu Jul 11 15:27:30 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=84d7a0a

The following commit has been merged in the master branch:
commit 84d7a0a9492d5fd1bd379f68f9872cd3a6e515af
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu May 9 19:05:21 2013 +0200

    Remove patch upstream_Remove-extra-sys-mount.h-include.patch.
---
 debian/changelog                                   |    1 +
 debian/patches/series                              |    1 -
 ...upstream_Remove-extra-sys-mount.h-include.patch |   26 --------------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14c6fa8..b377488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kde4libs (4:4.10.3-1) UNRELEASED; urgency=low
   * Bump debhelper build-dep/compat to 9.
   * Bump Standards-Version to 3.9.4.
   * Remove patch install_kcookiescfg.pl_with_exec_perms.diff.
+  * Remove patch upstream_Remove-extra-sys-mount.h-include.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 May 2013 18:49:01 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 6f8514d..ba888d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,5 +20,4 @@ add_dlrestrictions_support.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
-upstream_Remove-extra-sys-mount.h-include.patch
 kfreebsd_getmntent.diff
diff --git a/debian/patches/upstream_Remove-extra-sys-mount.h-include.patch b/debian/patches/upstream_Remove-extra-sys-mount.h-include.patch
deleted file mode 100644
index 5ef8623..0000000
--- a/debian/patches/upstream_Remove-extra-sys-mount.h-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4dd84f42abea1ff9cdd15e156c63776c0bf854b Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Wed, 3 Apr 2013 11:41:43 +0200
-Subject: [PATCH] Remove extra <sys/mount.h> include
-
-Added in b856e9b9e94a96ab396662db7a503280fa267dc3, it basically useless.
-(And it is not a standard header, so might be missing on some OSes.)
----
- kio/kio/kautomount.cpp |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp
-index e145b04..4ddf6d7 100644
---- a/kio/kio/kautomount.cpp
-+++ b/kio/kio/kautomount.cpp
-@@ -24,7 +24,6 @@
- #include <kdirnotify.h>
- #include <kdebug.h>
- #include <kmountpoint.h>
--#include <sys/mount.h>
- 
- /***********************************************************************
-  *
--- 
-1.7.10.4
-

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list