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

[Sune Vuorela]

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

The following commit has been merged in the master branch:
commit 12cc4c43288cf3e2226f8244664a1794ed2aa983
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Fri May 16 21:33:00 2014 +0200

    Fix use_libarchive_for_zip_files. Thanks to Augusto Beiro for noticing.
---
 debian/changelog                            | 6 ++++++
 debian/patches/use_libarchive_for_zip_files | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 612f783..a0abd49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ark (4:4.12.4-2) UNRELEASED; urgency=low
+
+  * Fix use_libarchive_for_zip_files. Thanks to Augusto Beiro for noticing.
+
+ -- Sune Vuorela <sune at debian.org>  Fri, 16 May 2014 21:32:12 +0200
+
 ark (4:4.12.4-1) unstable; urgency=medium
 
   * New patch: use_libarchive_for_zip_files (Closes: #723963)
diff --git a/debian/patches/use_libarchive_for_zip_files b/debian/patches/use_libarchive_for_zip_files
index 83ed549..4717972 100644
--- a/debian/patches/use_libarchive_for_zip_files
+++ b/debian/patches/use_libarchive_for_zip_files
@@ -25,7 +25,7 @@ index 5d6d009..14a1b22 100644
  ########### 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")
++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