rev 19911 - in kde-extras/basket/trunk/debian: . patches

Luigi Toscano tosky-guest at moszumanska.debian.org
Sun Jul 20 15:14:33 UTC 2014 

Author: tosky-guest
Date: 2014-07-20 15:14:33 +0000 (Sun, 20 Jul 2014)
New Revision: 19911

Added:
   kde-extras/basket/trunk/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
   kde-extras/basket/trunk/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
Removed:
   kde-extras/basket/trunk/debian/patches/18_no_kde3_libs.diff
Modified:
   kde-extras/basket/trunk/debian/basket-data.install
   kde-extras/basket/trunk/debian/basket.docs
   kde-extras/basket/trunk/debian/changelog
   kde-extras/basket/trunk/debian/control
   kde-extras/basket/trunk/debian/copyright
   kde-extras/basket/trunk/debian/patches/series
   kde-extras/basket/trunk/debian/watch
Log:
Update to upstream 2.10-beta

* Updated copyright, watch, *.install, basket.docs files.
* Fix Vcs-Svn header in debian/control
* Update standard version to 3.9.5. No changes required.
* Remove patch: 18_no_kde3_libs (obsolete).
* Add patches to properly install XDG files (thanks Pino):
  - 19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
  - 19b-cmake-remove-installation-of-basket.desktop-using-xd.patch


Modified: kde-extras/basket/trunk/debian/basket-data.install
===================================================================
--- kde-extras/basket/trunk/debian/basket-data.install	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/basket-data.install	2014-07-20 15:14:33 UTC (rev 19911)
@@ -1,6 +1,5 @@
 usr/share/locale
-usr/share/mimelnk/application
+usr/share/mime/packages
 usr/share/kde4/services
 usr/share/kde4/apps/basket
-usr/share/kde4/config/magic/basket.magic
 usr/share/icons/hicolor

Modified: kde-extras/basket/trunk/debian/basket.docs
===================================================================
--- kde-extras/basket/trunk/debian/basket.docs	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/basket.docs	2014-07-20 15:14:33 UTC (rev 19911)
@@ -1,2 +1,2 @@
-README
+README.md
 TODO

Modified: kde-extras/basket/trunk/debian/changelog
===================================================================
--- kde-extras/basket/trunk/debian/changelog	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/changelog	2014-07-20 15:14:33 UTC (rev 19911)
@@ -1,11 +1,22 @@
-basket (1.81-3.1) UNRELEASED; urgency=low
+basket (2.10~beta-1) experimental; urgency=medium
 
+  [ Mark Purcell ]
   * debian/control add Vcs: headers
   * Add myself to Uploaders:
   * debian/compat -> 9
 
- -- Mark Purcell <msp at debian.org>  Sun, 21 Apr 2013 09:30:04 +1000
+  [ Luigi Toscano ]
+  * New upstream version: 2.10~beta.
+  * Updated copyright, watch, *.install, basket.docs files.
+  * Fix Vcs-Svn header in debian/control
+  * Update standard version to 3.9.5. No changes required.
+  * Remove patch: 18_no_kde3_libs (obsolete).
+  * Add patches to properly install XDG files (thanks Pino):
+    - 19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
+    - 19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
 
+ -- Luigi Toscano <luigi.toscano at tiscali.it>  Sun, 20 Jul 2014 16:26:33 +0200
+
 basket (1.81-3) unstable; urgency=low
 
   * Split arch-independent data into basket-data package.

Modified: kde-extras/basket/trunk/debian/control
===================================================================
--- kde-extras/basket/trunk/debian/control	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/control	2014-07-20 15:14:33 UTC (rev 19911)
@@ -5,8 +5,8 @@
 Uploaders: Mark Purcell <msp at debian.org>, Sune Vuorela <debian at pusling.com>, Luigi Toscano <luigi.toscano at tiscali.it>
 Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.5), cmake, libx11-dev, libqimageblitz-dev, kdepimlibs5-dev (>=4:4.4.3), libgpgme11-dev
 Homepage: http://basket.kde.org/
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/basket/trunk/
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/basket/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/basket/trunk/
 
 Package: basket

Modified: kde-extras/basket/trunk/debian/copyright
===================================================================
--- kde-extras/basket/trunk/debian/copyright	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/copyright	2014-07-20 15:14:33 UTC (rev 19911)
@@ -8,14 +8,23 @@
 
 Copyright (c) 2004-2007 by Sebastien Laout <sebastien.laout at tuxfamily.org>
 Copyright (c) 2008-2010 by Dr. Robert Marmorstein <robert at narnia.homeunix.com>
-Copyright (c) 2008-2010 by Kelvie Wong <kelvie at ieee.org>
-Copyright (c) 2009-2010 by Matt Rogers <mattr at kde.org>
+Copyright (c) 2008-2012 by Kelvie Wong <kelvie at ieee.org>
+Copyright (c) 2009-2011 by Matt Rogers <mattr at kde.org>
+Copyright (c) 2010-2011 by Amir Pakdel <pakdel at gmail.com>
+Copyright (c) 2010-2011 by Brian C. Milco <bcmilco at gmail.com>
+Copyright (c) 2011      by Lionel Petit <lionelpetit at gmail.com>
+Copyright (c) 2013-2014 by Gleb Baryshev <gleb.baryshev at gmail.com>
+Copyright (C) 2006      by kodaaja <kodaaja at 68e0c82f-6715-0410-a4b6-c4571a790354>
 
 Upstream Author: Dr. Robert Marmorstein <robert at narnia.homeunix.com>
         	Matt Rogers <mattr at kde.org> 
         	Kelvie Wong <kelvie at ieee.org>
         	Sebastien Laout <sebastien.laout at tuxfamily.org>
+        	Gleb Baryshev <gleb.baryshev at gmail.com>
         	Petri Damstén <damu at iki.fi>
+        	Brian C. Milco <bcmilco at gmail.com>
+        	Lionel Petit <lionelpetit at gmail.com>
+        	Amir Pakdel <pakdel at gmail.com>
 	    	Alex Gontmakher <gsasha at cs.technion.ac.il>
 	        Marco Martin <m4rt at libero.it>
 		and other contributers

Added: kde-extras/basket/trunk/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
===================================================================
--- kde-extras/basket/trunk/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch	                        (rev 0)
+++ kde-extras/basket/trunk/debian/patches/19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch	2014-07-20 15:14:33 UTC (rev 19911)
@@ -0,0 +1,41 @@
+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
+

Added: kde-extras/basket/trunk/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
===================================================================
--- kde-extras/basket/trunk/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch	                        (rev 0)
+++ kde-extras/basket/trunk/debian/patches/19b-cmake-remove-installation-of-basket.desktop-using-xd.patch	2014-07-20 15:14:33 UTC (rev 19911)
@@ -0,0 +1,35 @@
+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
+

Modified: kde-extras/basket/trunk/debian/patches/series
===================================================================
--- kde-extras/basket/trunk/debian/patches/series	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/patches/series	2014-07-20 15:14:33 UTC (rev 19911)
@@ -1,2 +1,3 @@
 14_update_es_po.diff
-18_no_kde3_libs.diff
+19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
+19b-cmake-remove-installation-of-basket.desktop-using-xd.patch

Modified: kde-extras/basket/trunk/debian/watch
===================================================================
--- kde-extras/basket/trunk/debian/watch	2014-07-12 06:30:30 UTC (rev 19910)
+++ kde-extras/basket/trunk/debian/watch	2014-07-20 15:14:33 UTC (rev 19911)
@@ -1,5 +1,4 @@
 version=3
 
-opts=filenamemangle=s/.*\?file=(.*)$/$1\.tar\.bz2/ \
-  http://basket.kde.org/ downloads/\?file=basket-(.+) debian svn-upgrade
-  
+opts="uversionmangle=s/-([^0-9])/~\\1/" \
+  https://launchpad.net/basket/kde4/ https://launchpad.net/basket/kde4/.+/\+download/basket-(.+).tar.bz2

More information about the pkg-kde-commits mailing list