[SCM] basket packaging branch, master, updated. basket-2.10-beta-1-6-g74ed6f1

[Luigi Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/basket.git;a=commitdiff;h=4f0012c

The following commit has been merged in the master branch:
commit 4f0012c3a719da13a8e5a5afb678450092997eb0
Author: Luigi Toscano <luigi.toscano at tiscali.it>
Date:   Sun Oct 19 16:54:29 2014 +0200

    New git snapshot over 2.10~beta, refresh patchset
---
 debian/changelog                                   |  5 ++-
 ...ake-fix-installation-of-XDG-mimetypes-XML.patch | 41 ----------------------
 ...e-installation-of-basket.desktop-using-xd.patch | 35 ------------------
 debian/patches/series                              |  2 --
 4 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9286e0d..06f0e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,7 @@
-basket (2.10~beta-2) UNRELEASED; urgency=medium
+basket (2.10~beta+git6fed731-1) UNRELEASED; urgency=medium
+  * New git snapshot: drop patches included upstream:
+    - 19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
+    - 19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
   * The debian repository is on git, Vcs-Svn has been replaced by Vcs-Git
     and Vcs-Browser has been updated.
   * Update standard version to 3.9.6. No changes required.
diff --git a/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch b/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
deleted file mode 100644
index 70e3be2..0000000
--- a/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 250054aafdca5dce706fa1075186b6b701104991 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sun, 20 Jul 2014 11:37:09 +0200
-Subject: [PATCH] cmake: fix installation of XDG mimetypes XML
-
-Look for SharedMimeInfo and use the proper cmake macros of it to
-install the XML for the XDG mimetypes to the correct place and in the
-correct way.
----
- file-integration/CMakeLists.txt | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-Forwarded: https://github.com/gl-bars/basket/pull/14
-diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt
-index afad018..3f8013e 100644
---- a/file-integration/CMakeLists.txt
-+++ b/file-integration/CMakeLists.txt
-@@ -9,17 +9,15 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
- 
- ########### install files ###############
- 
--find_program(XDG-MIME_EXECUTABLE xdg-mime)
-+find_package(SharedMimeInfo REQUIRED)
- find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
- 
- install(FILES  basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-+install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-+update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
- install(CODE "
--execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor
--  ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml)
- execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
-   --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
--execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default
--  ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item)
- ")
- 
- kde4_install_icons(${ICON_INSTALL_DIR})
--- 
-2.0.1
-
diff --git a/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch b/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
deleted file mode 100644
index 0a9d4fd..0000000
--- a/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 42bc999b952584d170694424754a643000dc7c21 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sun, 20 Jul 2014 11:43:49 +0200
-Subject: [PATCH] cmake: remove installation of basket.desktop using
- xdg-desktop-menu
-
-basket.desktop is already installed correctly from src/CMakeLists.txt,
-so no need to do it again (and wrongly) here.
----
- file-integration/CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-Forwarded: https://github.com/gl-bars/basket/pull/14
-diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt
-index 3f8013e..ac7e362 100644
---- a/file-integration/CMakeLists.txt
-+++ b/file-integration/CMakeLists.txt
-@@ -10,14 +10,9 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
- ########### install files ###############
- 
- find_package(SharedMimeInfo REQUIRED)
--find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
- 
- install(FILES  basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
--install(CODE "
--execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
--  --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
--")
- 
- kde4_install_icons(${ICON_INSTALL_DIR})
--- 
-2.0.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 70ab905..467c19c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 14_update_es_po.diff
-19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
-19b-cmake-remove-installation-of-basket.desktop-using-xd.patch

-- 
basket packaging