[SCM] ark packaging branch, master, updated. debian/4.12.4-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2cb8fa748f4dc5919efef3da1ff07a96e39eadc1
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Feb 27 10:21:58 2014 +0100

    New patch: use_libarchive_for_zip_files
---
 debian/changelog                            |  2 +-
 debian/patches/series                       |  1 +
 debian/patches/use_libarchive_for_zip_files | 31 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ca8aeba..dda3af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ark (4:4.12.3-2) UNRELEASED; urgency=medium
 
-  * 
+  * New patch: use_libarchive_for_zip_files (Closes: #723963)
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 27 Feb 2014 10:17:35 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3a9a3d1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_libarchive_for_zip_files
diff --git a/debian/patches/use_libarchive_for_zip_files b/debian/patches/use_libarchive_for_zip_files
new file mode 100644
index 0000000..83ed549
--- /dev/null
+++ b/debian/patches/use_libarchive_for_zip_files
@@ -0,0 +1,31 @@
+commit 17ef504d8b63a864cd7d1ef7d4400027f4ec78db
+Author: Maximiliano Curia <maxy at debian.org>
+Date:   Thu Feb 27 11:25:38 2014 +0100
+
+    Use libarchive for zip files.
+
+diff --git a/plugins/clizipplugin/CMakeLists.txt b/plugins/clizipplugin/CMakeLists.txt
+index 5e180fb..cb80301 100644
+--- a/plugins/clizipplugin/CMakeLists.txt
++++ b/plugins/clizipplugin/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ ########### next target ###############
+ 
+-set(SUPPORTED_CLIZIP_MIMETYPES "application/x-java-archive;application/zip;")
++set(SUPPORTED_CLIZIP_MIMETYPES "application/x-java-archive;")
+ 
+ set(kerfuffle_clizip_SRCS cliplugin.cpp)
+ 
+diff --git a/plugins/libarchive/CMakeLists.txt b/plugins/libarchive/CMakeLists.txt
+index 5d6d009..14a1b22 100644
+--- a/plugins/libarchive/CMakeLists.txt
++++ b/plugins/libarchive/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_directories(${LIBARCHIVE_INCLUDE_DIR})
+ 
+ ########### next target ###############
+ set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;")
+-set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;")
++set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/zip")
+ if(HAVE_LIBARCHIVE_RPM_SUPPORT)
+   set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-rpm;application/x-source-rpm;")
+ endif(HAVE_LIBARCHIVE_RPM_SUPPORT)

-- 
ark packaging