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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 220320ac60a6759a0cb34c690cc710e8b03c4524
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 17 10:21:37 2013 +0200

    Remove fix-copying-of-files-with-extended-ACLs.patch (added in last merge), already applied upstream.
---
 debian/changelog                                   |    2 +
 .../fix-copying-of-files-with-extended-ACLs.patch  |   96 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 2 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c226202..5ca6996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kde4libs (4:4.10.5-2) UNRELEASED; urgency=low
 
   * Merge with kde4libs (4:4.8.4-4) unstable; urgency=low.
     - Fix changelog typo. (Closes: #692398)
+  * Remove fix-copying-of-files-with-extended-ACLs.patch (added in last
+    merge), already applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 17 Jul 2013 10:12:35 +0200
 
diff --git a/debian/patches/fix-copying-of-files-with-extended-ACLs.patch b/debian/patches/fix-copying-of-files-with-extended-ACLs.patch
deleted file mode 100644
index 85f5636..0000000
--- a/debian/patches/fix-copying-of-files-with-extended-ACLs.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From: David Faure <faure at kde.org>
-Origin: commit: 73ea8cee7661579d3c414f510f6a74fc241c3ecf
-Description: Fix copying of files with extended ACLs.
- The switch to #cmakedefine01 in KDE Frameworks has detected a missing
- #include <config-acl.h> in file_unix.cpp ever since it was splitted
- out. In case we still had a doubt about how much more superior the
- cmakedefine01 (#if instead of #ifdef) solution is...
-
- CCBUG: 191474
-  (not tested, but might help...)
----
- kioslave/file/file.cpp |   11 ++---------
- kioslave/file/file.h   |   10 ++++++++++
- 2 files changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/kioslave/file/file.cpp b/kioslave/file/file.cpp
-index 500f07c..f3a6448 100644
---- a/kioslave/file/file.cpp
-+++ b/kioslave/file/file.cpp
-@@ -28,7 +28,6 @@
- #include <QDirIterator>
- 
- #include <config.h>
--#include <config-acl.h>
- #include <config-kioslave-file.h>
- 
- 
-@@ -40,11 +39,6 @@
- #include <sys/time.h>
- #endif
- 
--#ifdef HAVE_POSIX_ACL
--#include <sys/acl.h>
--#include <acl/libacl.h>
--#endif
--
- #include <assert.h>
- #include <dirent.h>
- #include <errno.h>
-@@ -101,7 +95,6 @@ using namespace KIO;
- 
- static QString testLogFile( const QByteArray&_filename );
- #ifdef HAVE_POSIX_ACL
--static bool isExtendedACL(  acl_t p_acl );
- static void appendACLAtoms( const QByteArray & path, UDSEntry& entry,
-                             mode_t type, bool withACL );
- #endif
-@@ -1279,7 +1272,7 @@ static QString testLogFile( const QByteArray& _filename )
-  *************************************/
- #ifdef HAVE_POSIX_ACL
- 
--static bool isExtendedACL( acl_t acl )
-+bool FileProtocol::isExtendedACL( acl_t acl )
- {
-     return ( acl_equiv_mode( acl, 0 ) != 0 );
- }
-@@ -1298,7 +1291,7 @@ static void appendACLAtoms( const QByteArray & path, UDSEntry& entry, mode_t typ
-      * ACL separately. Since a directory can have both, we need to check again. */
-     if ( isDir ) {
-         if ( acl ) {
--            if ( !isExtendedACL( acl ) ) {
-+            if ( !FileProtocol::isExtendedACL( acl ) ) {
-                 acl_free( acl );
-                 acl = 0;
-             }
-diff --git a/kioslave/file/file.h b/kioslave/file/file.h
-index 98d64ca..79768ea 100644
---- a/kioslave/file/file.h
-+++ b/kioslave/file/file.h
-@@ -30,6 +30,12 @@
- #include <QtCore/QObject>
- #include <QtCore/QHash>
- 
-+#include <config-acl.h>
-+
-+#ifdef HAVE_POSIX_ACL
-+#include <sys/acl.h>
-+#include <acl/libacl.h>
-+#endif
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -78,6 +84,10 @@ public:
-   bool pumount( const QString &point );
-   bool pmount( const QString &dev );
- 
-+#ifdef HAVE_POSIX_ACL
-+  static bool isExtendedACL(acl_t acl);
-+#endif
-+
- private:
-   bool createUDSEntry( const QString & filename, const QByteArray & path, KIO::UDSEntry & entry,
-                        short int details, bool withACL );
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 8266dc9..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
-fix-copying-of-files-with-extended-ACLs.patch
 kfreebsd_getmntent.diff

-- 
KDE Development Platform Libraries module packaging